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

feat: 主动上报流程人员回显

Browse Source
This commit is contained in:
mzaxd
2023-12-18 11:39:31 +08:00
parent d74e68c092
commit 5a8dc24ed7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+1 -2
View File
@@ -443,11 +443,10 @@ public class ActFlowCommonService {
updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId); updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId);
updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()); updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName); updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
updateWrapper.set(ProcessApprovalRecord::getFinishFlag, ProcessStatusEnum.WITHDRAWN.getValue()); updateWrapper.set(ProcessApprovalRecord::getFinishFlag, CommitFlagEnum.UNDISPOSED.getValue());
processApprovalRecordService.update(updateWrapper); processApprovalRecordService.update(updateWrapper);
} }
/** /**
* 根据指定的执行Id递归获取所有子执行Id * 根据指定的执行Id递归获取所有子执行Id
* *
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+1 -1
View File
@@ -281,7 +281,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
taskService.setVariable(taskId, "approvalUserList", approvalUserSet); taskService.setVariable(taskId, "approvalUserList", approvalUserSet);
// 保存人员 // 保存人员
userMap.put("approvalUserList", String.join(",", approvalUserSet)); userMap.put("approvalUserList", String.join(",", approvalUserSet));
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setExecutionId(executionId));
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
} else { } else {