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-22 10:02:38 +08:00
parent caf437f86c
commit f62bd3dcd0
1 changed files with 11 additions and 6 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
+11 -6
View File
@@ -542,7 +542,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String designEngineer = term.getDesignEngineer(); String designEngineer = term.getDesignEngineer();
term1.setId(termId); term1.setId(termId);
term1.setAssessResults(assessResults); term1.setAssessResults(assessResults);
term1.setDescription(designEngineer); term1.setDesignEngineer(designEngineer);
if (!pass){ if (!pass){
continue; continue;
} }
@@ -586,19 +586,24 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String taskId = processDTO.getTaskId(); String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectStandardCommon.PASS, pass); variables.put(ProcessProjectStandardCommon.PASS, pass);
if (!pass){ List<String> designEngineerList;
if (pass){
designEngineerList = updateTermList.stream()
.map(ProcessProjectStandardTerm::getDesignEngineer)
.distinct()
.collect(Collectors.toList());
}else {
LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ProcessProjectStandardTermUser::getProcessId, businessId); wrapper1.eq(ProcessProjectStandardTermUser::getProcessId, businessId);
wrapper1.isNotNull(ProcessProjectStandardTermUser::getResponsibleUnitLeader); wrapper1.isNotNull(ProcessProjectStandardTermUser::getResponsibleUnitLeader);
List<ProcessProjectStandardTermUser> termUserList = termUserService.list(wrapper1); List<ProcessProjectStandardTermUser> termUserList = termUserService.list(wrapper1);
List<String> designEngineerList = termUserList.stream() designEngineerList = termUserList.stream()
.map(ProcessProjectStandardTermUser::getResponsibleUnitLeader) .map(ProcessProjectStandardTermUser::getResponsibleUnitLeader)
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
} }
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
taskService.complete(taskId, variables); taskService.complete(taskId, variables);
if (pass){ if (pass){
//发送消息 //发送消息