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

feature/REQ-7125 - 调整审批节点方式内部逻辑，透传参建单位类型给人岗架

Browse Source
This commit is contained in:
wangli 2026-03-11 15:35:21 +08:00
parent 421a2bdd7b
commit e642dc7f0e
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.nodeId(orgDTO.getNodeId())
.upLevel(SignApproverOrgLimitEnum.LV_ALL.getCode())
.crossDomain(false)
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case within_the_project_construction_units:
@ -101,6 +102,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
v2ReqBuilder.scope(FlowTaskAssignerScopeDTO.builder()
.nodeId(orgDTO.getNodeId())
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case initiator:
@ -108,6 +110,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
v2ReqBuilder.scope(FlowTaskAssignerScopeDTO.builder()
.nodeId(initiator.parseNodeId())
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case pre_node_approver:
@ -120,6 +123,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
v2ReqBuilder.scope(FlowTaskAssignerScopeDTO.builder()
.nodeId(lastOperationApprover.parseNodeId())
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
default:

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

@ -95,6 +95,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.nodeId(orgDTO.getNodeId())
.upLevel(SignApproverOrgLimitEnum.LV_ALL.getCode())
.crossDomain(false)
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case within_the_project_construction_units:
@ -117,6 +118,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case initiator:
@ -127,6 +129,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4Initiator.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4Initiator.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case pre_node_approver:
@ -142,6 +145,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4PreNodeApprover.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4PreNodeApprover.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
default:

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

@ -97,6 +97,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.nodeId(orgDTO.getNodeId())
.upLevel(SignApproverOrgLimitEnum.LV_ALL.getCode())
.crossDomain(false)
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case within_the_project_construction_units:
@ -119,6 +120,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case initiator:
@ -129,6 +131,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4Initiator.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4Initiator.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
case pre_node_approver:
@ -145,6 +148,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel
.upLevel(getApproverSpecifyRangeOrgLimit(flowElement).orElse(SignApproverOrgLimitEnum.UNKNOWN).getCode())
.crossDomain(approverSpecifyRangeUnit4PreNodeApprover.filter(unit -> unit != in_project).isPresent())
.entUpLevel(approverSpecifyRangeUnit4PreNodeApprover.orElse(ApproverSpecifyRangeUnitEnum.UNKNOWN).getValue())
.cooperateTypes(getApproverSpecifyValueOfCooperateShipType(flowElement))
.build());
break;
default: