From 79a57e0844bdd3b5f06ebaac807a0896624be70f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 01 十二月 2023 10:24:06 +0800
Subject: [PATCH] 导出结构调整

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java |   66 ++++++++++++++-------------------
 1 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 0141f0d..d37dd49 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -168,51 +168,41 @@
         return ResponseValue.success(pageUtil);
     }
 
-    /**
-     * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
-     * @Author 鍗㈠簡闃�
-     * @Date 2023/11/2
-     */
+    @ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
+    })
     @GetMapping("/list/export")
-    public void export(Long id, HttpServletResponse response) {
+    public void export(Long id, HttpServletResponse response) throws Exception {
         if (id == null) {
             throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
         }
-        try {
-            OutputStream outputStream = response.getOutputStream();
-            List<ScrappedInfoExcelTemplate> export = lWhFormScrappedService.export(id);
-            if (CollectionUtils.isEmpty(export)) {
-                throw new RuntimeException("鏁版嵁涓虹┖");
-            }
-            TemplateExportParams exportParams = new TemplateExportParams("import/鎶ュ簾鐧昏鍗�.xlsx");
-            exportParams.setHeadingStartRow(2);
 
-            Optional<ScrappedInfoExcelTemplate> first = export.stream().findFirst();
-            ScrappedInfoExcelTemplate scrappedInfoExcelTemplate = first.get();
-            Long dealTime = scrappedInfoExcelTemplate.getDealTime();
-            String operatorName = scrappedInfoExcelTemplate.getOperatorName();
-            String businessFormCode = scrappedInfoExcelTemplate.getBusinessFormCode();
-
-            int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(ScrappedInfoExcelTemplate::getNum).sum();
-            int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(ScrappedInfoExcelTemplate::getTotalAmount).sum();
-
-            Map<String, Object> map = new HashMap<>();
-            map.put("code", businessFormCode);
-            map.put("date", DateUtils.toShowDate(dealTime));
-            map.put("name", operatorName);
-            map.put("countNum", countNum);
-            map.put("totalAmount", totalAmount);
-
-            Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
-            // 璁剧疆鍝嶅簲澶�
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("鎶ュ簾鍗曠櫥璁�.xlsx", "utf-8"));
-            sheets.write(outputStream);
-            sheets.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+        List<ScrappedInfoExcelTemplate> export = lWhFormScrappedService.export(id);
+        if (CollectionUtils.isEmpty(export)) {
+            throw new RuntimeException("鏁版嵁涓虹┖");
         }
+        TemplateExportParams exportParams = new TemplateExportParams("import/鎶ュ簾鐧昏鍗�.xlsx");
+        exportParams.setHeadingStartRow(2);
 
+        Optional<ScrappedInfoExcelTemplate> first = export.stream().findFirst();
+        ScrappedInfoExcelTemplate scrappedInfoExcelTemplate = first.get();
+        Long dealTime = scrappedInfoExcelTemplate.getDealTime();
+        String operatorName = scrappedInfoExcelTemplate.getOperatorName();
+        String businessFormCode = scrappedInfoExcelTemplate.getBusinessFormCode();
+
+        int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(ScrappedInfoExcelTemplate::getNum).sum();
+        int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(ScrappedInfoExcelTemplate::getTotalAmount).sum();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", businessFormCode);
+        map.put("date", DateUtils.toShowDate(dealTime));
+        map.put("name", operatorName);
+        map.put("countNum", countNum);
+        map.put("totalAmount", totalAmount);
+
+        Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
+        downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
 
     }
 

--
Gitblit v1.9.1