Browse Source

条件导出

phoenix 1 year ago
parent
commit
8437983cdf

+ 20 - 1
src/main/java/com/xjrsoft/module/textbook/controller/TextbookIssueRecordController.java

@@ -95,7 +95,26 @@ public class TextbookIssueRecordController {
 
 
     @GetMapping("/export")
     @GetMapping("/export")
     @ApiOperation(value = "导出")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookIssueRecordExportDto dto) {
+    public ResponseEntity<byte[]> exportData() {
+        List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getList();
+        List<TextbookIssueRecordExcelVo> dataList = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+        for (TextbookIssueRecordPageVo textbookIssueRecordPageVo : customerList) {
+            if(textbookIssueRecordPageVo.getCreateDate() == null){
+                continue;
+            }
+            textbookIssueRecordPageVo.setCreateDateStr(sdf.format(textbookIssueRecordPageVo.getCreateDate()));
+            dataList.add(BeanUtil.toBean(textbookIssueRecordPageVo, TextbookIssueRecordExcelVo.class));
+        }
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookIssueRecordExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookIssueRecord" + ExcelTypeEnum.XLSX.getValue());
+    }
+
+    @PostMapping("/export-query")
+    @ApiOperation(value = "指定导出")
+    public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody TextbookIssueRecordExportDto dto) {
         List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getList(dto);
         List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getList(dto);
         List<TextbookIssueRecordExcelVo> dataList = new ArrayList<>();
         List<TextbookIssueRecordExcelVo> dataList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");

+ 12 - 1
src/main/java/com/xjrsoft/module/textbook/controller/TextbookWarehouseRecordController.java

@@ -92,7 +92,18 @@ public class TextbookWarehouseRecordController {
 
 
     @GetMapping("/export")
     @GetMapping("/export")
     @ApiOperation(value = "导出")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordExportDto dto) {
+    public ResponseEntity<byte[]> exportData() {
+        List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getList();
+        List<TextbookWarehouseRecordExcelVo> dataList = BeanUtil.copyToList(customerList, TextbookWarehouseRecordExcelVo.class);
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookWarehouseRecordExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
+    }
+
+    @PostMapping("/export-query")
+    @ApiOperation(value = "指定导出")
+    public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody TextbookWarehouseRecordExportDto dto) {
         List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getList(dto);
         List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getList(dto);
         List<TextbookWarehouseRecordExcelVo> dataList = BeanUtil.copyToList(customerList, TextbookWarehouseRecordExcelVo.class);
         List<TextbookWarehouseRecordExcelVo> dataList = BeanUtil.copyToList(customerList, TextbookWarehouseRecordExcelVo.class);
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
         ByteArrayOutputStream bot = new ByteArrayOutputStream();

+ 2 - 0
src/main/java/com/xjrsoft/module/textbook/service/ITextbookIssueRecordService.java

@@ -21,4 +21,6 @@ public interface ITextbookIssueRecordService extends MPJBaseService<TextbookIssu
     Page<TextbookIssueRecordPageVo> getPage(Page<TextbookIssueRecordPageDto> page, TextbookIssueRecordPageDto dto);
     Page<TextbookIssueRecordPageVo> getPage(Page<TextbookIssueRecordPageDto> page, TextbookIssueRecordPageDto dto);
 
 
     List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto);
     List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto);
+
+    List<TextbookIssueRecordPageVo> getList();
 }
 }

+ 2 - 0
src/main/java/com/xjrsoft/module/textbook/service/ITextbookWarehouseRecordService.java

@@ -21,4 +21,6 @@ public interface ITextbookWarehouseRecordService extends MPJBaseService<Textbook
     Page<TextbookWarehouseRecordPageVo> getPage(Page<TextbookWarehouseRecordPageDto> page, TextbookWarehouseRecordPageDto dto);
     Page<TextbookWarehouseRecordPageVo> getPage(Page<TextbookWarehouseRecordPageDto> page, TextbookWarehouseRecordPageDto dto);
 
 
     List<TextbookWarehouseRecordPageVo> getList(TextbookWarehouseRecordExportDto dto);
     List<TextbookWarehouseRecordPageVo> getList(TextbookWarehouseRecordExportDto dto);
+
+    List<TextbookWarehouseRecordPageVo> getList();
 }
 }

+ 5 - 0
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookIssueRecordServiceImpl.java

@@ -32,4 +32,9 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
     public List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto) {
     public List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto) {
         return textbookIssueRecordMapper.getList(dto);
         return textbookIssueRecordMapper.getList(dto);
     }
     }
+
+    @Override
+    public List<TextbookIssueRecordPageVo> getList() {
+        return getList(new TextbookIssueRecordExportDto());
+    }
 }
 }

+ 5 - 0
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookWarehouseRecordServiceImpl.java

@@ -32,4 +32,9 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
     public List<TextbookWarehouseRecordPageVo> getList(TextbookWarehouseRecordExportDto dto) {
     public List<TextbookWarehouseRecordPageVo> getList(TextbookWarehouseRecordExportDto dto) {
         return textbookWarehouseRecordMapper.getList(dto);
         return textbookWarehouseRecordMapper.getList(dto);
     }
     }
+
+    @Override
+    public List<TextbookWarehouseRecordPageVo> getList() {
+        return getList(new TextbookWarehouseRecordExportDto());
+    }
 }
 }