From 9c2dab107551b64b3fe16e1c7c178a4c15cacb5b Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 30 七月 2024 15:37:55 +0800
Subject: [PATCH] feat:核算报告导出

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java              |   18 +++---------------
 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java |   10 +++++++++-
 ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml                    |    3 +--
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
index bd6aca7..7f7e84e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
@@ -37,27 +37,15 @@
     private Integer num;
 
     /**
-     * 閲戦
-     */
-    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "閲戦"})
-    private BigDecimal money;
-
-    /**
      * 鍒嗘暟
      */
     @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍒嗘暟"})
     private Integer score;
 
     /**
-     * 鍓╀綑鍒嗘暟
+     * 閲戦
      */
-    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍓╀綑鍒嗘暟"})
-    private Integer surplusScore;
-
-    /**
-     * 鍚堣
-     */
-    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍚堣"})
-    private BigDecimal total;
+    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "閲戦"})
+    private BigDecimal money;
 
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index cd1fed3..e603c06 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -199,12 +199,20 @@
     @Override
     @SneakyThrows
     public void export(Integer contractId, HttpServletResponse response) {
+        // 鑾峰彇鏁版嵁
+        List<CalculateExport> list = baseMapper.exportData(contractId);
+        CalculateExport calculateExport = new CalculateExport();
+        calculateExport.setRuleName("鍚堣");
+        calculateExport.setNum(list.stream().mapToInt(CalculateExport::getNum).sum());
+        calculateExport.setScore(list.stream().mapToInt(CalculateExport::getScore).sum());
+        list.add(calculateExport);
+        // 杈撳嚭鏂囦欢
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         String fileName = URLEncoder.encode("鏍哥畻鎶ュ憡", StandardCharsets.UTF_8).replace("\\+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
         EasyExcel.write(response.getOutputStream(), CalculateExport.class)
                 .sheet("鏍哥畻鎶ュ憡")
-                .doWrite(baseMapper.exportData(contractId));
+                .doWrite(list);
     }
 }
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index a5e761d..a3c9adf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -104,8 +104,7 @@
         SELECT
             SUBSTRING_INDEX(rule_name, '/', 1) AS rule_name,
             COUNT(*) AS num,
-            SUM(score) AS score,
-            (100 - SUM(score)) AS surplusScore
+            -SUM(score) AS score
         FROM t_contract_score
         WHERE contract_id = #{contractId} AND auditing_status = 'PASS' AND deleted = 0
         GROUP BY SUBSTRING_INDEX(rule_name, '/', 1)

--
Gitblit v1.8.0