项目晾晒看板过滤

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);