diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 99faedd18..50a9a67e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import java.text.ParseException; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 法规/认证任务计划 (各阶段确认进度) 表 @@ -93,6 +94,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl> queryByProjectId(String projectId,String cut) { List projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId); + List list = new ArrayList<>(); + if(StringUtils.isNotBlank(projectId)){ + for (String s : projectId.split(",")) { + List collect = projectTaskPlanningList.stream().filter(e -> s.equals(e.getProjectId())).collect(Collectors.toList()); + list.addAll(collect); + } + } List> result = new ArrayList<>(); TimeNodeVO listConfirmationVO=null; @@ -106,7 +114,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl timeNodeVOS = new ArrayList<>(); if(ObjectUtils.isNotEmpty(projectTaskPlanning.getListConfirmation())) { listConfirmationVO = new TimeNodeVO();