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

fix 81736 项目合规评估流程-转办的情况，人员信息处回显了转办的人员

Browse Source
This commit is contained in:
lijiarao
2024-02-04 11:38:56 +08:00
parent f0d4445efb
commit 16b60635ca
2 changed files with 2 additions and 47 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
-23
View File
@@ -491,10 +491,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
updateTermUserList.add(termUser); updateTermUserList.add(termUser);
} }
processProjectAssessTermUserService.updateBatchById(updateTermUserList); processProjectAssessTermUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList);
} }
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
// 完成任务 // 完成任务
@@ -555,10 +551,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
updateTermUserList.add(termUser); updateTermUserList.add(termUser);
} }
processProjectAssessTermUserService.updateBatchById(updateTermUserList); processProjectAssessTermUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList);
} }
} }
//模块负责人修改 //模块负责人修改
@@ -619,10 +611,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
updateTermUserList.add(termUser); updateTermUserList.add(termUser);
} }
processProjectAssessTermUserService.updateBatchById(updateTermUserList); processProjectAssessTermUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList);
} }
} }
@@ -880,10 +868,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
taskService.complete(taskId, variables); taskService.complete(taskId, variables);
ThreadLocalUtil.remove(); ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList);
} }
} }
@@ -966,10 +950,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
taskService.complete(taskId, variables); taskService.complete(taskId, variables);
ThreadLocalUtil.remove(); ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList);
} }
} }
@@ -1019,9 +999,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ThreadLocalUtil.remove(); ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, userIdList);
} }
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+2 -24
View File
@@ -483,7 +483,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
switch (taskDefinitionKey) { switch (taskDefinitionKey) {
//模块责任人审批 //模块责任人审批
case ProcessProjectStandardCommon.MKZRRSP_: case ProcessProjectStandardCommon.MKZRRSP_:
mkzrrffApprove(processInfoVO, processDTO, pass); mkzrrspApprove(processInfoVO, processDTO, pass);
break; break;
//部所主管级领导审批 //部所主管级领导审批
case ProcessProjectStandardCommon.BSZGJLDSP_1: case ProcessProjectStandardCommon.BSZGJLDSP_1:
@@ -503,7 +503,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
} }
//模块责任人审批 //模块责任人审批
private void mkzrrffApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) { private void mkzrrspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
String businessId = processInfoVO.getBusinessId(); String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId(); String originUserId = processApprovalRecord.getOriginUserId();
@@ -534,10 +534,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
updateTermUserList.add(update); updateTermUserList.add(update);
} }
termUserService.updateBatchById(updateTermUserList); termUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId);
} }
// 完成任务 // 完成任务
@@ -634,10 +630,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
updateTermUserList.add(update); updateTermUserList.add(update);
} }
termUserService.updateBatchById(updateTermUserList); termUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MANAGER_LEADER,userId); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MANAGER_LEADER,userId);
} }
String taskId = processDTO.getTaskId(); String taskId = processDTO.getTaskId();
@@ -788,9 +780,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
} }
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
//更新数据 //更新数据
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.FGGCSSP, userIdList);
runtimeService.setVariable(executionId,ProcessProjectStandardCommon.STANDARDS_ENGINEER,userId); runtimeService.setVariable(executionId,ProcessProjectStandardCommon.STANDARDS_ENGINEER,userId);
} }
taskService.complete(taskId, variables); taskService.complete(taskId, variables);
@@ -891,10 +880,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
variables.put(ProcessProjectStandardCommon.MANAGER_LEADER,userId); variables.put(ProcessProjectStandardCommon.MANAGER_LEADER,userId);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
} }
variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerIds); variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerIds);
variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size()); variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size());
@@ -976,10 +961,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
.distinct().collect(Collectors.toList()); .distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, designEngineerIds); processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, designEngineerIds);
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRFF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRSP_1, userIdList);
} }
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务 // 完成任务
@@ -1021,9 +1002,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
termUserService.updateBatchById(udpateTermUserList); termUserService.updateBatchById(udpateTermUserList);
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey); ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey);
if (!Objects.equals(userId,originUserId)){ if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, userIdList);
} }
// 完成任务 // 完成任务
String taskId = processDTO.getTaskId(); String taskId = processDTO.getTaskId();