From d6f957d452fb95a1156cbe34e375ecc8b6f7a4d6 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Wed, 14 May 2025 10:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=89=A7=E8=A1=8C=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/huzhou/entity/ProjectScore.java   |  4 +--
 .../service/IHuzhouContractinfoService.java   |  2 ++
 .../impl/HuzhouContractinfoServiceImpl.java   | 34 +++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java
index 6caf029..80037ec 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java
@@ -38,13 +38,13 @@ public class ProjectScore implements Serializable {
     /**
      * 红旗数量
      */
-    @ExcelIgnore
+    @ExcelProperty(value = "红旗数量")
     private String redFlagCount;
 
     /**
      * 评分细则
      */
-    @ExcelIgnore
+    @ExcelProperty(value = "评分细则")
     private String detail;
 
     @TableField(exist = false)
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java
index 90c1022..f6afce1 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java
@@ -56,4 +56,6 @@ public interface IHuzhouContractinfoService extends IService<HuzhouContractinfo>
     Boolean checkContractAmount(List<HuzhouContractinfo> contractList, String contractMoneyFieldsValue, String taskName) throws JsonProcessingException;
 
     ContractPayInfoDTO queryContractPaySituation(HuzhouProjectinfo projectInfo);
+
+    HuzhouContractinfo getContractInfoByProjectId(String projectId);
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
index 7169d7f..01f631c 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
@@ -592,6 +592,40 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
         return payInfoDTO;
     }
 
+    @Override
+    public HuzhouContractinfo getContractInfoByProjectId(String projectId) {
+        List<HuzhouContractinfo> realContractInfoList = contractinfoService.getRealContractinfoByprojectId(projectId);
+
+        // 初始化累加器
+        Double totalMoneySum = 0.0;
+        Double centralMoneySum = 0.0;
+        Double provincialMoneySum = 0.0;
+        Double cityMoneySum = 0.0;
+        Double countyMoneySum = 0.0;
+        Double selfMoneySum = 0.0;
+
+        // 遍历列表，进行累加
+        for (HuzhouContractinfo contractinfo : realContractInfoList) {
+            totalMoneySum += contractinfo.getTotalMoney() == null ? 0 : contractinfo.getTotalMoney();
+            centralMoneySum += contractinfo.getCentralMoney() == null ? 0 : contractinfo.getCentralMoney();
+            provincialMoneySum += contractinfo.getProvincialMoney() == null ? 0 : contractinfo.getProvincialMoney();
+            cityMoneySum += contractinfo.getCityMoney() == null ? 0 : contractinfo.getCityMoney();
+            countyMoneySum += contractinfo.getCountyMoney() == null ? 0 : contractinfo.getCountyMoney();
+            selfMoneySum += contractinfo.getSelfMoney() == null ? 0 : contractinfo.getSelfMoney();
+            log.info("totalMoneySum:{}--->centralMoneySum:{}", totalMoneySum,  centralMoneySum);
+        }
+
+        // 封装到新的对象中
+        HuzhouContractinfo huzhouContractinfo = new HuzhouContractinfo();
+        huzhouContractinfo.setTotalMoney(totalMoneySum);
+        huzhouContractinfo.setCentralMoney(centralMoneySum);
+        huzhouContractinfo.setProvincialMoney(provincialMoneySum);
+        huzhouContractinfo.setCityMoney(cityMoneySum);
+        huzhouContractinfo.setCountyMoney(countyMoneySum);
+        huzhouContractinfo.setSelfMoney(selfMoneySum);
+
+        return huzhouContractinfo;
+    }
 
 
 }