From 80dc08d54e54a1c3408680fce48b922830c6f440 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 6 Feb 2025 17:43:02 +0800
Subject: [PATCH] =?UTF-8?q?i=E7=9A=96=E9=80=81=E6=8E=A8=E9=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IwsCostPushController.java     | 20 ++++++++++++++++---
 .../push/domain/vo/IwsCostPushExportVo.java   |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
index 0ec6a8bd..1c30213e 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
@@ -11,7 +11,6 @@ import com.bonus.material.push.service.IwsCostPushService;
 import com.bonus.material.settlement.domain.SltAgreementInfo;
 import com.bonus.material.settlement.service.impl.SltAgreementInfoServiceImpl;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -98,8 +97,23 @@ public class IwsCostPushController extends BaseController {
                     })
                     .collect(Collectors.toList());
 
+            // 计算统计信息
+            BigDecimal totalLeaseMoney = exportVoList.stream().map(IwsCostPushExportVo::getLeaseMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalRepairMoney = exportVoList.stream().map(IwsCostPushExportVo::getRepairMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalLostMoney = exportVoList.stream().map(IwsCostPushExportVo::getLostMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalScrapMoney = exportVoList.stream().map(IwsCostPushExportVo::getScrapMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 创建统计行
+            IwsCostPushExportVo summaryVo = new IwsCostPushExportVo();
+            summaryVo.setMonth("合计租赁费用");
+            summaryVo.setLeaseMoney(totalLeaseMoney);
+
+            // 将统计行添加到数据列表中
+            exportVoList.add(summaryVo);
+
             // 导出Excel
-            new ExcelUtil<>(IwsCostPushExportVo.class).exportExcel(response, exportVoList, "费用推送审核表");
+            ExcelUtil<IwsCostPushExportVo> excelUtil = new ExcelUtil<>(IwsCostPushExportVo.class);
+            excelUtil.exportExcel(response, exportVoList, "费用推送审核表");
         } catch (Exception e) {
             // 记录异常并抛出自定义异常
             System.err.println("导出异常 = " + e.getMessage());
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/vo/IwsCostPushExportVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/vo/IwsCostPushExportVo.java
index b4cbd2c6..03409822 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/vo/IwsCostPushExportVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/vo/IwsCostPushExportVo.java
@@ -104,7 +104,7 @@ public class IwsCostPushExportVo implements Serializable {
     @Excel(name = "是否推送", readConverterExp = "0=未推送,1=已推送")
     private String isPush;
 
-    private String money;
+    private Double money;
 
     private String year;