fix: 80862 年度制修订计划(标准化发起)(部所联络人选取审批人) 驳回后,节点走到了标准化归档

This commit is contained in:
2024-01-26 10:11:09 +08:00
parent d7e33b4ea7
commit 49d32c2a5a
@@ -194,11 +194,13 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
Set<String> contactUserSet = dataList.stream().map(ProcessEsAnnualInit::getContactUser).collect(Collectors.toSet());
actVariables.put("contactUserList", contactUserSet);
actVariables.put("passFinalCollect", true);
actVariables.put("standardEngineer", flowUser.get("standardEngineer"));
return actVariables;
}
private Map<String, Object> getUserMap(Map<String, Object> variables) {
variables.remove("passFinalCollect");
// 转成逗号拼接
variables.put("contactUserList", Optional.ofNullable((HashSet<String>) variables.get("contactUserList"))
.map(list -> String.join(",", list))
@@ -382,6 +384,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
// 保存人员
userMap.put("mainDraftUser", String.join(",", mainDraftUserSet));
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
// 能走到这个节点则不需要跳过最终汇总
taskService.setVariable(taskId, "passFinalCollect", false);
break;
case CONTACT_USER_COLLECT:
dataList = annualInitData.getDataList();