From 148e7d57f9e9d6a12901780f500a2ac76322dcbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Wed, 11 Jun 2025 16:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BB=A3=E8=B0=A2=E7=89=A9=E5=92=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BB=A3=E8=B0=A2=E7=89=A9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...trustMaterialCheckoutResultController.java |  7 ++++---
 .../EntrustMaterialCheckoutResultService.java |  2 +-
 ...rustMaterialCheckoutResultServiceImpl.java | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
index 1078259..1932da4 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
@@ -118,12 +118,13 @@ public class EntrustMaterialCheckoutResultController {
     }
 
 
-    @GetMapping("/generateQuarterlyReportExcel")
+    @PostMapping("/generateQuarterlyReportExcel")
+    @ApiOperation("生成季度报告")
     public R generateQuarterlyReportExcel(@RequestBody GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException {
         if (dto == null || dto.getQuarterlyList() == null || dto.getQuarterlyList().size() == 0 || dto.getYear() == 0) {
             return R.failed("请输入正确的参数");
         }
-        entrustMaterialCheckoutResultService.generateQuarterlyReportExcel(dto, response);
-        return R.ok("导出成功!");
+        String filePath = entrustMaterialCheckoutResultService.generateQuarterlyReportExcel(dto, response);
+        return R.ok(filePath, "导出成功!");
     }
 }
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java
index 51dd2d2..a88da8c 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java
@@ -86,5 +86,5 @@ public interface EntrustMaterialCheckoutResultService extends IService<EntrustMa
 
     R pushSuspectDetectionResultTask(DLPUser dlpUser);
 
-    void generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException;
+    String generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException;
 }
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
index 25290b3..15e6697 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
@@ -43,6 +43,9 @@ import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -1616,7 +1619,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
 
 
     @Override
-    public void generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException {
+    public String generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException {
         HashMap<Integer, Map<String, List<Integer>>> map = this.generateQuarterlyReportData(dto.getYear(), dto.getQuarterlyList());
         XSSFWorkbook workbook = new XSSFWorkbook();
         Set<Integer> quarterlySet = map.keySet();
@@ -1629,8 +1632,20 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
         for (Integer quarterly : quarterlySet) {
             this.generateQuarterlyReportSheet(workbook, dto.getYear(), quarterly, map.get(quarterly));
         }
-        workbook.write(response.getOutputStream());
 
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        workbook.write(os);
+        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
+        String fileName = "";
+        if (dto.getQuarterlyList().size() == 1) {
+            fileName = dto.getYear() + "年第" + dto.getQuarterlyList().get(0) + "季度统计.xlsx";
+        } else {
+            fileName = dto.getYear() + "年第" + dto.getQuarterlyList().get(0) + "至" + dto.getQuarterlyList().get(dto.getQuarterlyList().size() - 1) + "季度统计.xlsx";
+        }
+        boolean ret = ossFile.fileSave("quarterlyReport/" + fileName, is);
+        if (ret) {
+            return "quarterlyReport/" + fileName;
+        } else return null;
     }