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

fix: 81873 年度制修订计划(标准化发起)--不同的主起草单位主管级领导审批下发，相同的主起草人填写信息，第2个处理的待办数据合并了

Browse Source
This commit is contained in:
mzaxd
2024-02-23 18:34:00 +08:00
parent 16292c47f4
commit 8334dad2ed
2 changed files with 3 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/esAnnualInit/listener/MainDraftWriteCreateListener.java
+1 -1
View File
@@ -32,6 +32,6 @@ public class MainDraftWriteCreateListener implements TaskListener {
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "parentExecutionId"); String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "parentExecutionId");
delegateTask.setVariable("parentExecutionId", parentExecutionId); delegateTask.setVariableLocal("parentExecutionId", parentExecutionId);
} }
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+2 -2
View File
@@ -245,7 +245,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskName = task.getName(); String taskName = task.getName();
String parentExecutionId = (String) taskService.getVariable(taskId, "parentExecutionId"); String parentExecutionId = (String) taskService.getVariableLocal(taskId, "parentExecutionId");
switch (taskName) { switch (taskName) {
case CONTACT_USER_SELECT: case CONTACT_USER_SELECT:
case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE: case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE:
@@ -393,7 +393,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
case MAIN_DRAFT_WRITE: case MAIN_DRAFT_WRITE:
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setMainDraftingUser(userId)); dataList.forEach(d -> d.setMainDraftingUser(userId));
saveOrUpdateBatch(dataList); updateBatchById(dataList);
// 找出所有主起草人 // 找出所有主起草人
Set<String> mainDraftUserSet = new HashSet<>(); Set<String> mainDraftUserSet = new HashSet<>();
dataList.forEach(d -> mainDraftUserSet.add(d.getMainDraftingUser())); dataList.forEach(d -> mainDraftUserSet.add(d.getMainDraftingUser()));