Commit 01fb75ac by 陈浩建

移动订单下载

parent 15e5a5e4
...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -61,6 +62,9 @@ public class ExportExcelController extends BaseController { ...@@ -61,6 +62,9 @@ public class ExportExcelController extends BaseController {
wrapper.like("create_user", user.getId().toString(), SqlLike.DEFAULT); wrapper.like("create_user", user.getId().toString(), SqlLike.DEFAULT);
} }
wrapper.like(StringUtils.isNotBlank(fileName), "file_name", fileName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(fileName), "file_name", fileName, SqlLike.DEFAULT);
List<String> objects = new ArrayList<>();
objects.add("create_time");
wrapper.orderDesc(objects);
Page<ExportExcel> page = new Page<>(pageIndex, pageSize); Page<ExportExcel> page = new Page<>(pageIndex, pageSize);
List<ExportExcel> exportExcels = exportExcelMapper.selectPage(page, wrapper); List<ExportExcel> exportExcels = exportExcelMapper.selectPage(page, wrapper);
page.setRecords(exportExcels); page.setRecords(exportExcels);
......
...@@ -46,7 +46,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { ...@@ -46,7 +46,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
try { try {
fileInputStream.close(); fileInputStream.close();
} catch (Exception e){ } catch (Exception e){
e.printStackTrace();
} }
} }
if(in != null) { if(in != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment