From 2bd9ddd56697e202a443d04139f854afa2559e95 Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126.com>
Date: 星期一, 29 四月 2024 14:26:58 +0800
Subject: [PATCH] 漏洞修改

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 9c6a5da..08ea887 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
@@ -155,7 +155,7 @@
     @ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
     @GetMapping("/list/export")
-    public void export(Long id, HttpServletResponse response) throws Exception {
+    public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
         if (id == null) {
             throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
         }
@@ -175,8 +175,8 @@
 
         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();
+        double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)
+            .mapToDouble(ScrappedInfoExcelTemplate::getAmount).sum();
 
         Map<String, Object> map = new HashMap<>();
         map.put("code", businessFormCode);
@@ -186,7 +186,8 @@
         map.put("totalAmount", totalAmount);
 
         Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
-        downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
+        String filePath = downLoadExcel("鎶ュ簾鐧昏鍗�", sheets);
+        return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
 
     }
 

--
Gitblit v1.9.1