From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 4bb8dbd..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 String export(Long id, HttpServletResponse response) throws Exception {
+    public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
         if (id == null) {
             throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
         }
@@ -186,7 +186,8 @@
         map.put("totalAmount", totalAmount);
 
         Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
-        return downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
+        String filePath = downLoadExcel("鎶ュ簾鐧昏鍗�", sheets);
+        return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
 
     }
 

--
Gitblit v1.9.1