szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat：调整字段名称

This commit is contained in:
lizhixian 2025-02-26 15:59:42 +08:00
parent b2ca263067
commit 37b2fd4789
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
View File

@ -24,7 +24,7 @@ public class BpmTaskApproveReqVO {
@Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED)
private Map<String, Object> variables; private Map<String, Object> variables;
@Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}") @Schema(description = "下一个节点审批人", example = "{nodeId:[1, 2]}")
private Map<String, List<Long>> startUserSelectAssignees; private Map<String, List<Long>> nextAssignees;
} }

8
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
View File

@ -520,11 +520,11 @@ public class BpmTaskServiceImpl implements BpmTaskService {
if (CollUtil.isNotEmpty(reqVO.getVariables())) { if (CollUtil.isNotEmpty(reqVO.getVariables())) {
Map<String, Object> variables = FlowableUtils.filterTaskFormVariable(reqVO.getVariables()); Map<String, Object> variables = FlowableUtils.filterTaskFormVariable(reqVO.getVariables());
// 下个节点审批人如果不存在，则由前端传递 // 下个节点审批人如果不存在，则由前端传递
if (CollUtil.isNotEmpty(reqVO.getStartUserSelectAssignees())) { if (CollUtil.isNotEmpty(reqVO.getNextAssignees())) {
// 获取实例中的全部节点数据，避免后续节点的审批人被覆盖 // 获取实例中的全部节点数据，避免后续节点的审批人被覆盖
Map<String, List<Long>> startUserSelectAssignees = FlowableUtils.getStartUserSelectAssignees(instance.getProcessVariables()); Map<String, List<Long>> hisProcessVariables = FlowableUtils.getStartUserSelectAssignees(instance.getProcessVariables());
startUserSelectAssignees.putAll(reqVO.getStartUserSelectAssignees()); hisProcessVariables.putAll(reqVO.getNextAssignees());
variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees); variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, hisProcessVariables);
} }
runtimeService.setVariables(task.getProcessInstanceId(), variables); runtimeService.setVariables(task.getProcessInstanceId(), variables);
taskService.complete(task.getId(), variables, true); taskService.complete(task.getId(), variables, true);