Skip to content

Commit ec6343f

Browse files
committed
fix: 减签动作排在加签之后,测试改用按类型取动作 (#266)
- ApprovalNode 默认动作顺序调整为 通过/拒绝/保存/加签/减签/转办/退回/委派 - FlowSampleServiceTest、FlowMockSampleServiceTest 中按索引取动作改为按 ActionType 查找, 避免动作列表顺序变化导致取错动作(#266 测试反馈)
1 parent 6463299 commit ec6343f

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

‎flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ApprovalNode.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,11 @@ private static List<IFlowAction> defaultActions() {
6262
actions.add(RejectAction.defaultAction());
6363
actions.add(SaveAction.defaultAction());
6464
actions.add(AddAuditAction.defaultAction());
65+
// 减签紧跟加签,仅循序/并签且存在其他待审批人时可见(issue #266)
66+
actions.add(ReduceAuditAction.defaultAction());
6567
actions.add(TransferAction.defaultAction());
6668
actions.add(ReturnAction.defaultAction());
6769
actions.add(DelegateAction.defaultAction());
68-
// 减签追加在末尾,避免改变既有动作的顺序(动作列表是按序展示的对外契约);
69-
// 仅循序/并签且存在其他待审批人时可见(issue #266)
70-
actions.add(ReduceAuditAction.defaultAction());
7170
return actions;
7271
}
7372

‎flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowMockSampleServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ void transfer() {
18311831
transferRequest.setFormData(data);
18321832
transferRequest.setRecordId(bossRecordList.get(0).getId());
18331833

1834-
FlowAdviceBody transferAdviceBody = new FlowAdviceBody(bossActions.get(4).id(), boss.getUserId());
1834+
FlowAdviceBody transferAdviceBody = new FlowAdviceBody(bossNode.actionManager().getActionByType(ActionType.TRANSFER.name()).id(), boss.getUserId());
18351835
transferAdviceBody.setForwardOperatorIds(List.of(3L));
18361836
transferRequest.setAdvice(transferAdviceBody);
18371837
factory.flowService.action(transferRequest);
@@ -1946,7 +1946,7 @@ void returnNode() {
19461946
returnRequest.setFormData(data);
19471947
returnRequest.setRecordId(bossRecordList.get(0).getId());
19481948

1949-
FlowAdviceBody backAdviceBody = new FlowAdviceBody(bossActions.get(5).id(), boss.getUserId());
1949+
FlowAdviceBody backAdviceBody = new FlowAdviceBody(bossNode.actionManager().getActionByType(ActionType.RETURN.name()).id(), boss.getUserId());
19501950
backAdviceBody.setBackNodeId(startNode.getId());
19511951
returnRequest.setAdvice(backAdviceBody);
19521952
factory.flowService.action(returnRequest);
@@ -2069,7 +2069,7 @@ void delegate() {
20692069
delegateRequest.setFormData(data);
20702070
delegateRequest.setRecordId(bossRecordList.get(0).getId());
20712071

2072-
FlowAdviceBody delegateAdviceBody = new FlowAdviceBody(bossActions.get(6).id(), boss.getUserId());
2072+
FlowAdviceBody delegateAdviceBody = new FlowAdviceBody(bossNode.actionManager().getActionByType(ActionType.DELEGATE.name()).id(), boss.getUserId());
20732073
delegateAdviceBody.setForwardOperatorIds(List.of(lorne.getUserId()));
20742074
delegateRequest.setAdvice(delegateAdviceBody);
20752075
factory.flowService.action(delegateRequest);

‎flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowSampleServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ void returnShouldKeepHistoryAndOrder() {
526526
FlowActionRequest bReturnRequest = new FlowActionRequest();
527527
bReturnRequest.setFormData(data);
528528
bReturnRequest.setRecordId(bRecordList.get(0).getId());
529-
FlowAdviceBody bReturnAdvice = new FlowAdviceBody(bActions.get(5).id(), "退回修改", bUser.getUserId());
529+
FlowAdviceBody bReturnAdvice = new FlowAdviceBody(bNode.actionManager().getActionByType(ActionType.RETURN.name()).id(), "退回修改", bUser.getUserId());
530530
// 退回节点设置为 a 节点
531531
bReturnAdvice.setBackNodeId(aNode.getId());
532532
bReturnRequest.setAdvice(bReturnAdvice);
@@ -2670,7 +2670,7 @@ void transfer() {
26702670
transferRequest.setFormData(data);
26712671
transferRequest.setRecordId(bossRecordList.get(0).getId());
26722672

2673-
FlowAdviceBody transferAdviceBody = new FlowAdviceBody(bossActions.get(4).id(), boss.getUserId());
2673+
FlowAdviceBody transferAdviceBody = new FlowAdviceBody(bossNode.actionManager().getActionByType(ActionType.TRANSFER.name()).id(), boss.getUserId());
26742674
transferAdviceBody.setForwardOperatorIds(List.of(3L));
26752675
transferRequest.setAdvice(transferAdviceBody);
26762676
factory.flowService.action(transferRequest);
@@ -2785,7 +2785,7 @@ void returnNode() {
27852785
returnRequest.setFormData(data);
27862786
returnRequest.setRecordId(bossRecordList.get(0).getId());
27872787

2788-
FlowAdviceBody backAdviceBody = new FlowAdviceBody(bossActions.get(5).id(), boss.getUserId());
2788+
FlowAdviceBody backAdviceBody = new FlowAdviceBody(bossNode.actionManager().getActionByType(ActionType.RETURN.name()).id(), boss.getUserId());
27892789
backAdviceBody.setBackNodeId(startNode.getId());
27902790
returnRequest.setAdvice(backAdviceBody);
27912791
factory.flowService.action(returnRequest);
@@ -2908,7 +2908,7 @@ void delegate() {
29082908
delegateRequest.setFormData(data);
29092909
delegateRequest.setRecordId(bossRecordList.get(0).getId());
29102910

2911-
FlowAdviceBody delegateAdviceBody = new FlowAdviceBody(bossActions.get(6).id(), boss.getUserId());
2911+
FlowAdviceBody delegateAdviceBody = new FlowAdviceBody(bossNode.actionManager().getActionByType(ActionType.DELEGATE.name()).id(), boss.getUserId());
29122912
delegateAdviceBody.setForwardOperatorIds(List.of(lorne.getUserId()));
29132913
delegateRequest.setAdvice(delegateAdviceBody);
29142914
factory.flowService.action(delegateRequest);

0 commit comments

Comments
 (0)