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

update - 调整"业务指定审批人"的 operationDesc 生成的位置

Browse Source
This commit is contained in:
wangli 2024-01-08 15:40:47 +08:00
parent 739028266a
commit c511c18b3d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,9 +80,11 @@ import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AND;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_PASSED; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_PASSED;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_REJECTED; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_REJECTED;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.BUSINESS_BIZ_SPECIFY; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.BUSINESS_BIZ_SPECIFY;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.GENERAL;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.OR; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.OR;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_CARBON_COPY; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_CARBON_COPY;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_TASK; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_TASK;
import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS; import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS;
import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_NOT_EXISTS; import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_NOT_EXISTS;
@ -566,7 +568,11 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
node.setId(userTask.getId()) node.setId(userTask.getId())
.setName(userTask.getName()) .setName(userTask.getName())
.setFormKey(userTask.getFormKey()) .setFormKey(userTask.getFormKey())
.setNodeType(NODE_TASK); .setNodeType(NODE_TASK)
.setNodeMode(GENERAL);//兜底设置
if (Objects.equals(NODE_STARTER.getType(), i.getId())) {
node.setNodeType(NODE_STARTER);
}
getApprovalMethod(userTask).ifPresent(approvalMethod -> { getApprovalMethod(userTask).ifPresent(approvalMethod -> {
switch (approvalMethod) { switch (approvalMethod) {
@ -588,6 +594,8 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
AND : OR); AND : OR);
} else if (userTask.getBehavior() instanceof UserTaskActivityBehavior) { } else if (userTask.getBehavior() instanceof UserTaskActivityBehavior) {
node.setNodeMode(BpmnFlowNodeMode.GENERAL); node.setNodeMode(BpmnFlowNodeMode.GENERAL);
} else {
node.setNodeMode(BpmnFlowNodeMode.GENERAL);
} }
break; break;
} }