WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目状态看板排序

Browse Source
This commit is contained in:
zhn
2022-06-02 13:51:28 +08:00
parent bf2e67eaa4
commit 2a8730d2de
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+9 -1
View File
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Description: 法规/认证任务计划 (各阶段确认进度) 表 * @Description: 法规/认证任务计划 (各阶段确认进度) 表
@@ -93,6 +94,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
@Override @Override
public List<List<TimeNodeVO>> queryByProjectId(String projectId,String cut) { public List<List<TimeNodeVO>> queryByProjectId(String projectId,String cut) {
List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId); 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<>(); List<List<TimeNodeVO>> result = new ArrayList<>();
TimeNodeVO listConfirmationVO=null; TimeNodeVO listConfirmationVO=null;
@@ -106,7 +114,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
cal1.set(Calendar.SECOND, 0); cal1.set(Calendar.SECOND, 0);
cal1.set(Calendar.MILLISECOND, 0); cal1.set(Calendar.MILLISECOND, 0);
Date trueNow = cal1.getTime(); Date trueNow = cal1.getTime();
for (ProjectTaskPlanning projectTaskPlanning : projectTaskPlanningList) { for (ProjectTaskPlanning projectTaskPlanning : list) {
List<TimeNodeVO> timeNodeVOS = new ArrayList<>(); List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getListConfirmation())) { if(ObjectUtils.isNotEmpty(projectTaskPlanning.getListConfirmation())) {
listConfirmationVO = new TimeNodeVO(); listConfirmationVO = new TimeNodeVO();