wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-7125) - 1. 调整系统按钮枚举 2.修改部分审批日志文案 3. 增加管理员指定审批人策略实现

Browse Source
This commit is contained in:
wangli 2026-02-28 13:58:46 +08:00
parent f7c83133c7
commit b04f9d00eb
6 changed files with 97 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnButtonEnum.java
View File

@ -68,10 +68,27 @@ public enum BpmnButtonEnum {
* 催办按钮
*/
BPMN_REMIND(11, "BPMN_REMIND", "催办", Lists.newArrayList(APPROVAL, SIGN)),
/**
* 管理员指定审批人（仅用于模型配置的审批人为空时，管理员指定审批人策略）
*/
BPMN_REPOINT(12, "BPMN_REPOINT", "指定审批人", Lists.newArrayList(APPROVAL, SIGN)),
/**
* 管理员转交按钮
*/
BPMN_ADMIN_TRANSFER(90, "BPMN_ADMIN_TRANSFER", "管理员转交", Lists.newArrayList()),
/**
* 管理员同意按钮
*/
BPMN_ADMIN_APPROVE(91, "BPMN_ADMIN_APPROVE", "管理员同意", Lists.newArrayList()),
/**
* 管理员驳回按钮
*/
BPMN_ADMIN_REJECT(92, "BPMN_ADMIN_REJECT", "管理员驳回", Lists.newArrayList()),
/**
* 管理员回退按钮
*/
BPMN_ADMIN_ROLLBACK(93, "BPMN_ADMIN_ROLLBACK", "管理员回退", Lists.newArrayList()),
/**
* 兜底
*/

9
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java
View File

@ -249,12 +249,17 @@ public class EngineExecutionStartListener implements ExecutionListener {
execution, true));
}
finalEmptyAssigneeHandle(assigners, userTask, execution, "未找到审批人且转交管理员失败，自动终止", "karma: " + (refreshProperties.getUseNewToAdminApi() ? "api/flow/listTaskAssignerAdmin/v2" : "api/flow/listTaskAssignerAdmin"));
finalEmptyAssigneeHandle(assigners, userTask, execution, "未找到审批人且转交管理员失败，系统终止", "karma: " + (refreshProperties.getUseNewToAdminApi() ? "api/flow/listTaskAssignerAdmin/v2" : "api/flow/listTaskAssignerAdmin"));
break;
case specifyAssignee:
assigners.addAll(approverSelect(ApproverEmptyHandleTypeEnum.specifyAssignee.getType(), userTask,
execution, true));
finalEmptyAssigneeHandle(assigners, userTask, execution, "转交指定人员失败，自动终止", "org-gateway: api/node-user/list");
finalEmptyAssigneeHandle(assigners, userTask, execution, "转交指定人员失败，系统终止", "org-gateway: api/node-user/list");
break;
case transferToAdminSpecify:
// REQ-7125 新增管理员指定审批人策略
assigners.addAll(approverSelect(ApproverEmptyHandleTypeEnum.transferToAdminSpecify.getType(), userTask, execution, true));
finalEmptyAssigneeHandle(assigners, userTask, execution, "未找到审批人且转交管理员失败，系统终止", "karma: " + (refreshProperties.getUseNewToAdminApi() ? "api/flow/listTaskAssignerAdmin/v2" : "api/flow/listTaskAssignerAdmin"));
break;
default:
break;

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -1707,7 +1707,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
build.setOperationDesc("待审批");
break;
case transferToAdmin:
build.setOperationDesc("找不到审批人且转交管理员失败，自动终止");
build.setOperationDesc("找不到审批人且转交管理员失败，系统终止");
break;
case human:
if (Objects.equals(e.getNodeMode(), EXCEPTIONAL)) {

56
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminSpecifyTaskAssigneeSelector.java Normal file
View File

@ -0,0 +1,56 @@
package cn.axzo.workflow.server.controller.delegate;
import cn.axzo.workflow.common.enums.ApproverEmptyHandleTypeEnum;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.conf.SupportRefreshProperties;
import cn.axzo.workflow.core.deletage.approverscope.ApproverScopeDTO;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 基于"转交给管理员"查询审批人
*
* @author wangli
* @since 2023/11/16 11:44
*/
@Slf4j
@Component
public class TransferToAdminSpecifyTaskAssigneeSelector extends TransferToAdminTaskAssigneeSelector {
@Resource
private SupportRefreshProperties supportRefreshProperties;
@Override
public String getType() {
return ApproverEmptyHandleTypeEnum.transferToAdminSpecify.getType();
}
@Override
public List<BpmnTaskDelegateAssigner> select(FlowElement flowElement, DelegateExecution execution,
Boolean throwException) {
return super.select(flowElement, execution, throwException);
}
@Override
protected List<BpmnTaskDelegateAssigner> invokeService(FlowElement flowElement, DelegateExecution execution,
ApproverScopeDTO scopeDto) {
log.info("transferToAdmin invokeService executing...");
List<BpmnTaskDelegateAssigner> assigners = new ArrayList<>();
if (Boolean.TRUE.equals(supportRefreshProperties.getUseNewToAdminApi())) {
assigners.addAll(invokeNewQuery(flowElement, execution, scopeDto));
} else {
assigners.addAll(invokeOldQuery(flowElement, execution, scopeDto));
}
// 这里的审批人仅只能有“指定审批人”按钮的权限
assigners.forEach(i -> i.setIsTransferToAdminSpecify(true));
return assigners;
}
}

4
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java
View File

@ -72,7 +72,7 @@ public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigne
}
private List<BpmnTaskDelegateAssigner> invokeOldQuery(FlowElement flowElement, DelegateExecution execution, ApproverScopeDTO scopeDto) {
protected List<BpmnTaskDelegateAssigner> invokeOldQuery(FlowElement flowElement, DelegateExecution execution, ApproverScopeDTO scopeDto) {
log.info("transferToAdmin invokeOldQuery executing...");
ListFlowTaskAssignerReq.ListFlowTaskAssignerReqBuilder builder = ListFlowTaskAssignerReq.builder();
if (!CollectionUtils.isEmpty(scopeDto.getOrgScopes())) {
@ -107,7 +107,7 @@ public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigne
return BeanUtil.copyToList(flowTaskAssigners, BpmnTaskDelegateAssigner.class);
}
private List<BpmnTaskDelegateAssigner> invokeNewQuery(FlowElement flowElement, DelegateExecution execution, ApproverScopeDTO scopeDto) {
protected List<BpmnTaskDelegateAssigner> invokeNewQuery(FlowElement flowElement, DelegateExecution execution, ApproverScopeDTO scopeDto) {
log.info("transferToAdmin invokeNewQuery executing...");
Optional<ApproverScopeEnum> approverScope = BpmnMetaParserHelper.getApproverScope((UserTask) flowElement);
Optional<ApproverSpecifyEnum> optSpecify = BpmnMetaParserHelper.getApproverSpecify((UserTask) flowElement);

14
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
View File

@ -81,6 +81,7 @@ import static cn.axzo.workflow.common.constant.VariableConstants.VAR_PROCESS_TEN
import static cn.axzo.workflow.common.constant.VariableConstants.VAR_TASK_ID;
import static cn.axzo.workflow.common.constant.VariableConstants.VAR_TASK_START_TIME;
import static cn.axzo.workflow.common.constant.VariableConstants.VAR_TASK_USER_NAME;
import static cn.axzo.workflow.common.enums.BpmnButtonEnum.BPMN_REPOINT;
import static cn.axzo.workflow.common.enums.BpmnButtonEnum.BPMN_UPGRADE;
import static cn.axzo.workflow.common.enums.ProcessMessagePushEventEnum.PROCESS_CARBON_COPY;
import static cn.axzo.workflow.common.enums.ProcessMessagePushEventEnum.PROCESS_CARBON_COPY_COMPLETE;
@ -90,6 +91,7 @@ import static cn.axzo.workflow.common.enums.ProcessMessagePushEventEnum.PROCESS_
import static cn.axzo.workflow.common.enums.ProcessMessagePushEventEnum.PROCESS_PUSH_PENDING_COMPLETE;
import static cn.axzo.workflow.common.enums.ProcessMessagePushEventEnum.PROCESS_PUSH_PENDING_ROLLBACK;
import static cn.axzo.workflow.common.enums.ProcessMessagePushEventEnum.PROCESS_PUSH_SMS;
import static cn.axzo.workflow.common.model.request.bpmn.BpmnButtonMetaInfo.BUTTON_TYPE_SYSTEM;
/**
* 特殊的相外部传递需发送站内信/待办/短信的事件处理器
@ -192,6 +194,18 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener<
buttons.addAll(buttonConf.getCarbonCopy());
}
});
if (Objects.equals(Boolean.TRUE, bpmnTaskDelegateAssigner.getIsTransferToAdminSpecify())) {
buttons.clear();
BpmnButtonMetaInfo specifyButton = new BpmnButtonMetaInfo();
specifyButton.setBtnKey(BPMN_REPOINT.getBtnKey());
specifyButton.setBtnName(BPMN_REPOINT.getBtnName());
specifyButton.setChecked(true);
specifyButton.setDisabled(false);
specifyButton.setType(BUTTON_TYPE_SYSTEM);
specifyButton.setSupportBizType(BPMN_REPOINT.getSupportBizType());
buttons.add(specifyButton);
}
}
// 如果提级审批的变量未 false