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 projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page, projectInfoAuthSelect); if(projectAndChildInfoPageList.getRecords().size()>0){ - List ids = projectAndChildInfoPageList.getRecords().stream().map(x -> x.getId()).collect(Collectors.toList()); + List 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 projectSummaryPageList = projectinfoMapper.getProjectSummaryPageListByTask(ids); for(ProjectSummaryOV p:projectSummaryPageList){ - List groupByTask = projectAndChildInfoPageList.getRecords().stream().filter(x -> x.getReformName().equals(p.getReformName()) && x.getSuperLeader().equals(p.getSuperLeader())).collect(Collectors.toList()); + List groupByTask = projectAndChildInfoPageList.getRecords() + .stream() + .filter(x -> x.getReformName().equals(p.getReformName()) && x.getSuperLeader().equals(p.getSuperLeader())).collect(Collectors.toList()); List projectIds = groupByTask.stream().map(x -> x.getId()).collect(Collectors.toList()); String progress = this.countProgress(projectIds); p.setProjectProgress(progress);