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

This commit is contained in:
2024-02-23 18:34:00 +08:00
parent 16292c47f4
commit 8334dad2ed
2 changed files with 3 additions and 3 deletions
@@ -32,6 +32,6 @@ public class MainDraftWriteCreateListener implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "parentExecutionId");
delegateTask.setVariable("parentExecutionId", parentExecutionId);
delegateTask.setVariableLocal("parentExecutionId", parentExecutionId);
}
}
@@ -245,7 +245,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskName = task.getName();
String parentExecutionId = (String) taskService.getVariable(taskId, "parentExecutionId");
String parentExecutionId = (String) taskService.getVariableLocal(taskId, "parentExecutionId");
switch (taskName) {
case CONTACT_USER_SELECT:
case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE:
@@ -393,7 +393,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
case MAIN_DRAFT_WRITE:
dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setMainDraftingUser(userId));
saveOrUpdateBatch(dataList);
updateBatchById(dataList);
// 找出所有主起草人
Set<String> mainDraftUserSet = new HashSet<>();
dataList.forEach(d -> mainDraftUserSet.add(d.getMainDraftingUser()));