sion/sionrui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: [BPM 工作流] 子流程审批不通过，结束主流程审批，并标记为不通过

Browse Source
This commit is contained in:
jason
2025-08-27 22:34:41 +08:00
parent 128f61a1ed
commit d6643c9a27
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java
View File

@@ -19,6 +19,7 @@ public enum BpmReasonEnum {
CANCEL_PROCESS_INSTANCE_BY_START_USER("用户主动取消流程，原因：{}"), // 场景：用户主动取消流程
CANCEL_PROCESS_INSTANCE_BY_ADMIN("管理员【{}】取消流程，原因：{}"), // 场景：管理员取消流程
CANCEL_CHILD_PROCESS_INSTANCE_BY_MAIN_PROCESS("子流程自动取消，原因：主流程已取消"),
REJECT_CHILD_PROCESS("子流程审批不通过"),
// ========== 流程任务的独有原因 ==========

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

@@ -67,6 +67,7 @@ import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum.REJECT_CHILD_PROCESS;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_RETURN_FLAG;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_SKIP_START_USER_NODE;
@@ -805,8 +806,23 @@ public class BpmTaskServiceImpl implements BpmTaskService {
return;
}
// 3.2 情况二：直接结束，审批不通过
// 3.2.1 如果是子流程，需获取父流程。标记父流程为不通过。
// 注意需要在子流程结束前标记，因为如果子流程是最后一个节点。在子流程结束后标记, 会报错
ProcessInstance parentProcessInstance = null;
if (StrUtil.isNotBlank(instance.getSuperExecutionId())) {
Execution execution = runtimeService.createExecutionQuery().executionId(instance.getSuperExecutionId()).singleResult();
parentProcessInstance = processInstanceService.getProcessInstance(execution.getProcessInstanceId());
// 标记父流程不通过
processInstanceService.updateProcessInstanceReject(parentProcessInstance, REJECT_CHILD_PROCESS.getReason());
}
// 3.2.2 标记流程为不通过并结束流程
processInstanceService.updateProcessInstanceReject(instance, reqVO.getReason()); // 标记不通过
moveTaskToEnd(task.getProcessInstanceId(), BpmCommentTypeEnum.REJECT.formatComment(reqVO.getReason())); // 结束流程
// 3.2.3 如果是子流程，结束主流程
if (parentProcessInstance!=null) {
moveTaskToEnd(parentProcessInstance.getId(), BpmCommentTypeEnum.REJECT.formatComment(REJECT_CHILD_PROCESS.getReason()));
}
}
/**