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

fix 81734 法规合规评估流程-模块责任人评审节点有转办情况，办理提示操作失败

Browse Source
This commit is contained in:
lijiarao
2024-02-04 09:59:14 +08:00
parent 43881b113c
commit 53ac1771a6
1 changed files with 10 additions and 13 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
+10 -13
View File
@@ -519,17 +519,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
// 完成任务
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectStandardCommon.PASS, pass);
if (!pass){
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
}
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
//更新数据 //更新数据
LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>();
@@ -550,9 +539,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId);
} }
// 完成任务
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectStandardCommon.PASS, pass);
if (!pass){
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
}
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
} }
//部所主管级领导审批 //部所主管级领导审批
private void bszgjldspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass, boolean hasParent) { private void bszgjldspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass, boolean hasParent) {