From 0577172ac7045968af08586b7a9ef73feb811142 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 20 May 2025 14:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=99=BE=E6=99=92=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HuzhouProjectinfoServiceImpl.java     | 10 ++++++++--
 1 file changed, 8 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 1d51447..644714d 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
@@ -1664,10 +1664,16 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         Page page = new Page(1, 10000);
         Page<HuzhouProjectinfoOV> projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page, projectInfoAuthSelect);
         if(projectAndChildInfoPageList.getRecords().size()>0){
-            List<String> ids = projectAndChildInfoPageList.getRecords().stream().map(x -> x.getId()).collect(Collectors.toList());
+            List<String> ids = projectAndChildInfoPageList.getRecords()
+                    .stream()
+                    .filter(x -> !x.getStage().equals("-1"))
+                    .filter(x -> !x.getStage().equals("0.1"))
+                    .map(x -> x.getId()).collect(Collectors.toList());
             List<ProjectSummaryOV> projectSummaryPageList = projectinfoMapper.getProjectSummaryPageListByTask(ids);
             for(ProjectSummaryOV p:projectSummaryPageList){
-                List<HuzhouProjectinfoOV> groupByTask = projectAndChildInfoPageList.getRecords().stream().filter(x -> x.getReformName().equals(p.getReformName()) && x.getSuperLeader().equals(p.getSuperLeader())).collect(Collectors.toList());
+                List<HuzhouProjectinfoOV> groupByTask = projectAndChildInfoPageList.getRecords()
+                        .stream()
+                        .filter(x -> x.getReformName().equals(p.getReformName()) && x.getSuperLeader().equals(p.getSuperLeader())).collect(Collectors.toList());
                 List<String> projectIds = groupByTask.stream().map(x -> x.getId()).collect(Collectors.toList());
                 String progress = this.countProgress(projectIds);
                 p.setProjectProgress(progress);