From 2a8730d2deaf1749a87b32a18509ead2c19ca8da Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 2 Jun 2022 13:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectTaskPlanningServiceImpl.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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<ProjectTaskPlann
 	@Override
 	public List<List<TimeNodeVO>> queryByProjectId(String projectId,String cut) {
 		List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId);
+		List<ProjectTaskPlanning> list = new ArrayList<>();
+		if(StringUtils.isNotBlank(projectId)){
+			for (String s : projectId.split(",")) {
+				List<ProjectTaskPlanning> collect = projectTaskPlanningList.stream().filter(e -> s.equals(e.getProjectId())).collect(Collectors.toList());
+				list.addAll(collect);
+			}
+		}
 		List<List<TimeNodeVO>> result = new ArrayList<>();
 
 		TimeNodeVO listConfirmationVO=null;
@@ -106,7 +114,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 		cal1.set(Calendar.SECOND, 0);
 		cal1.set(Calendar.MILLISECOND, 0);
 		Date trueNow = cal1.getTime();
-		for (ProjectTaskPlanning projectTaskPlanning : projectTaskPlanningList) {
+		for (ProjectTaskPlanning projectTaskPlanning : list) {
 			List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
 			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getListConfirmation())) {
 				listConfirmationVO = new TimeNodeVO();