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

fix: 年度制修订各部门主动上报丢失上级人BUG

Browse Source
This commit is contained in:
mzaxd
2023-12-13 15:13:47 +08:00
parent 0ef48e74e8
commit 11d16531db
1 changed files with 5 additions and 2 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
+5 -2
View File
@@ -168,6 +168,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
List<String> workGroupUserList = StrUtil.split(workGroupUsers, ','); List<String> workGroupUserList = StrUtil.split(workGroupUsers, ',');
// 设置流程变量 // 设置流程变量
taskService.setVariable(taskId, "workGroupUserList", workGroupUserList); taskService.setVariable(taskId, "workGroupUserList", workGroupUserList);
// 将联络人主管级上一级领导保存到流程变量中
taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader);
} else { } else {
// 保存联络人主管级上级领导 // 保存联络人主管级上级领导
dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
@@ -187,11 +189,13 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
remove(wrapper); remove(wrapper);
annualReport = annualReportDataVO.getDataList().get(0); annualReport = annualReportDataVO.getDataList().get(0);
String collectUserLeader = annualReport.getCollectUserLeader(); String collectUserLeader = annualReport.getCollectUserLeader();
contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
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.setProcessInstanceId(processInstanceId)); dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
// 保存收集联络人主管级领导 // 保存收集联络人主管级领导
dataList.forEach(data -> data.setCollectUserLeader(collectUserLeader)); dataList.forEach(data -> data.setCollectUserLeader(collectUserLeader));
dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
dataList.forEach(data -> data.setWorkGroupUser(workGroupUser)); dataList.forEach(data -> data.setWorkGroupUser(workGroupUser));
saveBatch(dataList); saveBatch(dataList);
// 设置下一个节点的审批人流程变量 // 设置下一个节点的审批人流程变量
@@ -202,8 +206,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
wrapper.eq(ProcessEsAnnualReport::getContactUser, contactUser); wrapper.eq(ProcessEsAnnualReport::getContactUser, contactUser);
wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
remove(wrapper); remove(wrapper);
annualReport = annualReportDataVO.getDataList().get(0); contactUserLeaderLeader = (String) runtimeService.getVariable(executionId, contactUser + "-ContactUserLeaderLeader");
contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setExecutionId(executionId));
dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader); taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);