From c681777d6364b363ccaa1b2c909e6b655712102b Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 15 Apr 2025 16:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouProjectinfoServiceImpl.java     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 1846af0..56fca95 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -2829,8 +2829,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                     LambdaQueryWrapper<HuzhouPlaninfo> qw = new LambdaQueryWrapper<>();
                     qw.eq(HuzhouPlaninfo::getTaskName, currentPointName)
                             .eq(HuzhouPlaninfo::getProjectId, projectId);
-                    HuzhouPlaninfo planInfo = planinfoMapper.selectOne(qw);
-
+                    // HuzhouPlaninfo planInfo = planinfoMapper.selectOne(qw);
+                    HuzhouPlaninfo planInfo =planinfoMapper.selectList(qw).get(0);
                     Date actualStartTime = planInfo.getActualStartTime();
                     Date scheduledEndTime = planInfo.getScheduledEndTime();
                     if (actualStartTime != null) {
@@ -2851,6 +2851,20 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                 }
 
                 // 其他设置操作...
+                // 2.设置整体资金支付情况:上级资金支付比例=（实际支付上级资金/计划支付上级资金）*100%
+                fillSuperiorFundPayRate(projectInfo);
+
+                // 3.设置节点资金支付情况:资金支付超时时间=实际支付时间-计划支付时间
+                ContractPayInfoDTO tmp = contractinfoService.queryContractPaySituation(projectInfo);
+                projectInfo.setTimeOutPaySituation(tmp.getTimeOutPaySituation());
+                // 4.设置超时支付次数：超时支付次数=超时完成天数/7
+                projectInfo.setTimeOutPayCount(tmp.getTimeOutPayCount());
+                // 5.设置文件上传占用率
+                projectInfo.setUploadFileRate(planinfofileService.getUploadFileRate(projectId));
+                // 6设置变更次数
+                projectInfo.setUpdateCount(fieldchangehistoryService.queryUpdateCount(projectId));
+                log.info("项目:{}->超时支付次数为:{}", projectInfo.getProjectName(),projectInfo.getUpdateCount());
+
             }
             // 按照责任工作地点排序
             projectInfoList = projectInfoList.stream()