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
2024-01-23 10:18:12 +08:00
parent 863b1dfb1b
commit 2a0d70a900
1 changed files with 25 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/projectstandard/service/ProcessProjectStandardService.java
+25 -7
View File
@@ -320,6 +320,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
//保存条款 //保存条款
List<ProcessProjectStandardTerm> processProjectStandardTermList = businessInfoDTO.getProcessProjectStandardTermList(); List<ProcessProjectStandardTerm> processProjectStandardTermList = businessInfoDTO.getProcessProjectStandardTermList();
for (ProcessProjectStandardTerm term : processProjectStandardTermList) { for (ProcessProjectStandardTerm term : processProjectStandardTermList) {
term.setId(null);
term.setProcessId(processId); term.setProcessId(processId);
term.setImplementationDate(implementationDate); term.setImplementationDate(implementationDate);
} }
@@ -533,11 +534,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
wrapper.eq(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_COMPLIANT); wrapper.eq(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_COMPLIANT);
List<ProcessProjectStandardTermUser> notCompliantList = termUserService.list(wrapper); List<ProcessProjectStandardTermUser> notCompliantList = termUserService.list(wrapper);
Map<String, List<ProcessProjectStandardTermUser>> termIdMap = CollStreamUtil.groupByKey(notCompliantList, ProcessProjectStandardTermUser::getTermId); Map<String, List<ProcessProjectStandardTermUser>> termIdMap = CollStreamUtil.groupByKey(notCompliantList, ProcessProjectStandardTermUser::getTermId);
//查询全部评估
wrapper.clear();
wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId);
List<ProcessProjectStandardTermUser> allTermUserList = termUserService.list(wrapper);
Map<String, List<ProcessProjectStandardTermUser>> allTermIdMap = CollStreamUtil.groupByKey(allTermUserList, ProcessProjectStandardTermUser::getTermId);
//查询表单 //查询表单
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList(); List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
List<String> carbonCopyPersonnelList = new ArrayList<>(); List<String> carbonCopyPersonnelList = new ArrayList<>();
List<ProcessProjectStandardTerm> updateTermList = new ArrayList<>(); List<ProcessProjectStandardTerm> updateTermList = new ArrayList<>();
List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>();
Date date = new Date(); Date date = new Date();
for (ProcessProjectStandardTerm term : termList) { for (ProcessProjectStandardTerm term : termList) {
ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm(); ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm();
@@ -548,13 +555,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
continue; continue;
} }
term1.setId(termId); term1.setId(termId);
term1.setAssessResults(assessResults);
if(StringUtils.isBlank(designEngineer)){
designEngineer = term.getModuleOwner();
}
if(StringUtils.isBlank(designEngineer)){
designEngineer = term.getResponsibleUnitLeader();
}
term1.setDesignEngineer(designEngineer); term1.setDesignEngineer(designEngineer);
updateTermList.add(term1); updateTermList.add(term1);
carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(","))); carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(",")));
@@ -586,12 +586,30 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String description = termUserList.stream().map(ProcessProjectStandardTermUser::getDescription).collect(Collectors.joining(",")); String description = termUserList.stream().map(ProcessProjectStandardTermUser::getDescription).collect(Collectors.joining(","));
projectLibrary.setDescription(description); projectLibrary.setDescription(description);
} }
if (allTermIdMap.containsKey(termId)) {
List<ProcessProjectStandardTermUser> termUserList = allTermIdMap.get(termId);
for (ProcessProjectStandardTermUser termUser : termUserList) {
ProcessProjectStandardTermUser updateTermUser = new ProcessProjectStandardTermUser();
updateTermUser.setId(termUser.getId());
String designEngineer1 = termUser.getDesignEngineer();
term1.setAssessResults(assessResults);
if(StringUtils.isBlank(designEngineer1)){
designEngineer1 = termUser.getModuleOwner();
}
if(StringUtils.isBlank(designEngineer1)){
designEngineer1 = termUser.getResponsibleUnitLeader();
}
updateTermUser.setDesignEngineer(designEngineer1);
updateTermUserList.add(updateTermUser);
}
}
//推送数据到法规项目库 //推送数据到法规项目库
lawsSpecialProjectLibraryService.save(projectLibrary); lawsSpecialProjectLibraryService.save(projectLibrary);
} }
//更新数据 //更新数据
if (pass){ if (pass){
termService.updateBatchById(updateTermList); termService.updateBatchById(updateTermList);
termUserService.updateBatchById(updateTermUserList);
} }
// 完成任务 // 完成任务
String taskId = processDTO.getTaskId(); String taskId = processDTO.getTaskId();