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

fix 81822 项目合规评估流程--各部所主管级领导审批节点驳回，也出现驳回给原来人员的问题了

Browse Source
This commit is contained in:
lijiarao
2024-02-05 20:40:20 +08:00
parent eb757bebb4
commit 1f9dd92060
1 changed files with 22 additions and 18 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
+22 -18
View File
@@ -509,6 +509,17 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
Task task = processDTO.getTask(); Task task = processDTO.getTask();
String executionId = task.getExecutionId(); String executionId = task.getExecutionId();
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
String assessmentId = processInfoVO.getBusinessId();
//查询模块负责人列表
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
List<String> moduleOwnerList = projectAssessTermUsers.stream()
.map(ProcessProjectAssessTermUser::getModuleOwner)
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>(); List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
@@ -519,25 +530,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
allTermUserList.add(termUser); allTermUserList.add(termUser);
} }
processProjectAssessTermUserService.updateBatchById(allTermUserList); processProjectAssessTermUserService.updateBatchById(allTermUserList);
String assessmentId = processInfoVO.getBusinessId();
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
List<String> moduleOwnerList = projectAssessTermUsers.stream()
.map(ProcessProjectAssessTermUser::getModuleOwner)
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
// 完成任务
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.PASS, pass);
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerList);
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId);
@@ -551,7 +544,18 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
updateTermUserList.add(termUser); updateTermUserList.add(termUser);
} }
processProjectAssessTermUserService.updateBatchById(updateTermUserList); processProjectAssessTermUserService.updateBatchById(updateTermUserList);
runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MANAGER_LEADER,userId);
} }
// 完成任务
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.PASS, pass);
if (!pass){
runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MODULE_OWNER_LIST,moduleOwnerList);
}
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
} }
//模块负责人修改 //模块负责人修改
private void mkfzrxgApprove(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO, boolean pass) { private void mkfzrxgApprove(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO, boolean pass) {