From 07160e90c074ff05ea6ae5f905795f95342b123e Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Thu, 8 May 2025 17:07:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HuzhouPlaninfofileServiceImpl.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
index 2143b33..f1a1de0 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
@@ -801,11 +801,22 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         Date now = new Date();
         double rate =0.0;
         int totalFileCount = 0;
+        // 不能定义为0
         int unFinishFileCount = 0;
         int currentNeedFileCount = 0;
 
         List<HuzhouPlaninfo> planInfoList = planinfoService.getListByProjectId(projectId);
 
+        List<HuzhouPlaninfo> filteredPlanInfoList = planInfoList.stream()
+                .filter(item -> "0".equals(item.getIsfinish()))
+                .collect(Collectors.toList());
+        for (HuzhouPlaninfo planInfo : filteredPlanInfoList) {
+            String taskFile = planInfo.getTaskFile();
+            // 当且节点未上传的文件数量
+            unFinishFileCount += countFiles(taskFile);
+        }
+
+
         if (CollectionUtil.isNotEmpty(planInfoList)) {
             for (HuzhouPlaninfo planInfo : planInfoList) {
                 String taskFile = planInfo.getTaskFile();
@@ -822,7 +833,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
                     currentNeedFileCount += countFiles(taskFile);
                 }
             }
-            // 当且节点已经上传文件数量
+            // 当且节点已经上传文件数量 总的-未完成 = 已上传
             int uploadFileCount = totalFileCount - unFinishFileCount;
 
             List<HuzhouPlaninfo> currentPlanInfo = planInfoList.stream()