ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 项目合规评估流程 流程提交失败

Browse Source
This commit is contained in:
lijiarao
2023-12-25 17:03:48 +08:00
parent 318e257ad9
commit 73b2a698ef
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+20 -7
View File
@@ -372,7 +372,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
//去重
List<String> responsibleUnitLeaderList = Arrays.asList(responsibleUnitLeaders.split(","));
List<String> distinctResponsibleUnitLeader = responsibleUnitLeaderList.stream().distinct().collect(Collectors.toList());
List<String> distinctResponsibleUnitLeader = responsibleUnitLeaderList.stream()
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
for (String responsibleUnitLeader : distinctResponsibleUnitLeader) {
ProcessProjectAssessTermUser processProjectAssessTermUser = new ProcessProjectAssessTermUser();
processProjectAssessTermUser.setAssessmentId(assessmentId);
@@ -382,7 +384,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
allResponsibleUnitLeaderList.addAll(distinctResponsibleUnitLeader);
}
List<String> distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream().distinct().collect(Collectors.toList());
List<String> distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream()
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
String distinctAllResponsibleUnitLeaderListJoin = CollectionUtil.join(distinctAllResponsibleUnitLeaderList, ",");
processProjectAssessTermUserService.saveBatch(saveProcessProjectAssessTermUserList);
@@ -468,8 +472,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
List<String> moduleOwnerList = projectAssessTermUsers.stream().map(ProcessProjectAssessTermUser::getModuleOwner).distinct().collect(Collectors.toList());
List<String> moduleOwnerList = projectAssessTermUsers.stream()
.map(ProcessProjectAssessTermUser::getModuleOwner)
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
// 完成任务
String taskId = processDTO.getTaskId();
@@ -505,7 +511,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey);
List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
List<String> designEngineerList = projectAssessTermUsers.stream().map(ProcessProjectAssessTermUser::getDesignEngineer).distinct().collect(Collectors.toList());
List<String> designEngineerList = projectAssessTermUsers.stream()
.map(ProcessProjectAssessTermUser::getDesignEngineer)
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG2, designEngineerList);
// 完成任务
@@ -727,7 +736,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
processProjectAssessTermUserService.saveBatch(allTermUserList);
moduleOwnerIds = moduleOwnerIds.stream().distinct().collect(Collectors.toList());
moduleOwnerIds = moduleOwnerIds.stream()
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, moduleOwnerIds);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, moduleOwnerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -804,7 +815,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
processProjectAssessTermUserService.saveBatch(allTermUserList);
designEngineerIds = designEngineerIds.stream().distinct().collect(Collectors.toList());
designEngineerIds = designEngineerIds.stream()
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, designEngineerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务