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

fix: 各部门主动上报流程第三个节点报错

Browse Source
This commit is contained in:
mzaxd
2023-12-12 09:48:36 +08:00
parent e0f8351df5
commit c5dee34d47
1 changed files with 6 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/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+6 -3
View File
@@ -151,9 +151,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskName = task.getName(); String taskName = task.getName();
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
ProcessEsAnnualReport annualReport;
switch (taskName) { switch (taskName) {
case CONTACT_USER_DISTRIBUTE: case CONTACT_USER_DISTRIBUTE:
ProcessEsAnnualReport annualReport = annualReportDataVO.getDataList().get(0); annualReport = annualReportDataVO.getDataList().get(0);
boolean distribute = annualReport.getDistributeFlag().equals("1"); boolean distribute = annualReport.getDistributeFlag().equals("1");
String contactUserLeaderLeader = annualReport.getContactUserLeaderLeader(); String contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
taskService.setVariable(taskId, "distribute", distribute); taskService.setVariable(taskId, "distribute", distribute);
@@ -178,16 +179,18 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
} }
break; break;
case WORK_GROUP_COLLECT: case WORK_GROUP_COLLECT:
annualReport = annualReportDataVO.getDataList().get(0);
String collectUserLeader = annualReport.getCollectUserLeader();
String executionId = task.getExecutionId(); String executionId = task.getExecutionId();
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser"); String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
dataList.forEach(data -> data.setContactUser(contactUser)); dataList.forEach(data -> data.setContactUser(contactUser));
dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setExecutionId(executionId));
// 保存收集联络人主管级领导 // 保存收集联络人主管级领导
dataList.forEach(data -> data.setCollectUserLeader((String) flowUserVO.get("collectUserLeader"))); dataList.forEach(data -> data.setCollectUserLeader(collectUserLeader));
dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId())); dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId()));
saveBatch(dataList); saveBatch(dataList);
// 设置下一个节点的审批人流程变量 // 设置下一个节点的审批人流程变量
taskService.setVariableLocal(taskId, "collectUserLeader", flowUserVO.get("collectUserLeader")); taskService.setVariable(taskId, "collectUserLeader", collectUserLeader);
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
// 先删后增 // 先删后增