Skip to content

Commit 4b57e94

Browse files
committed
fix: 流程节点记录区分拒绝与终止(rejected / terminated)
- ProcessNode 新增 rejected / terminated 响应字段,拒绝记录与通过记录不再无法区分 - FlowProcessNodeService 依据 flowState 判定结束节点是否为非正常结束(拒绝终止、异常) - FlowRejectTerminateTest 补充终止与通过场景断言,框架全量 337 个测试通过 - 无数据结构变更,判定基于既有 actionType / flowState,历史数据无需迁移 - 更新 flow-frontend 子模块至 337b0f7 关联:#241
1 parent 27e25e9 commit 4b57e94

4 files changed

Lines changed: 94 additions & 2 deletions

File tree

‎flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/ProcessNode.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.flow.pojo.response;
22

3+
import com.codingapi.flow.action.ActionType;
34
import com.codingapi.flow.domain.SubProcessRecord;
45
import com.codingapi.flow.node.IFlowNode;
56
import com.codingapi.flow.node.nodes.StartNode;
@@ -67,6 +68,22 @@ public class ProcessNode {
6768
*/
6869
private boolean parentProcessRecord;
6970

71+
/**
72+
* 是否为拒绝动作产生的记录(审批拒绝)。
73+
*
74+
* <p>拒绝记录与通过记录同为「已办」,仅通过 {@link ApproveState} 无法区分,
75+
* 因此单独标记,供前端展示「已拒绝」。新增字段不影响历史数据与旧版前端。
76+
*/
77+
private boolean rejected;
78+
79+
/**
80+
* 流程是否非正常结束(如拒绝终止流程)。
81+
*
82+
* <p>仅结束节点有效:{@code flowState} 为 {@code SATE_FLOW_FINISH} 表示正常结束,
83+
* 其余终态(终止、异常)视为非正常结束,供前端展示「已终止」。
84+
*/
85+
private boolean terminated;
86+
7087
/**
7188
* 子流程节点执行信息,仅 SUB_PROCESS 节点产生执行记录后返回。
7289
*/
@@ -113,6 +130,8 @@ public enum ApproveState {
113130
private void resetApproveState(FlowRecord flowRecord) {
114131
if (flowRecord.isDone()) {
115132
this.approveState = ApproveState.PASS;
133+
// 拒绝动作产生的记录同样为已办,需要额外标记,避免与审批通过混淆
134+
this.rejected = ActionType.REJECT.name().equals(flowRecord.getActionType());
116135
}
117136

118137
if (flowRecord.isError()) {
@@ -206,12 +225,25 @@ public static ProcessNode createBySubProcessRecord(SubProcessRecord record,
206225

207226

208227
public static ProcessNode createByEndNode(IFlowNode flowNode, boolean finish) {
228+
return createByEndNode(flowNode, finish, false);
229+
}
230+
231+
/**
232+
* 构建结束节点。
233+
*
234+
* @param flowNode 结束节点
235+
* @param finish 流程是否已结束
236+
* @param terminated 是否为非正常结束(拒绝终止、异常结束等)
237+
* @return 结束节点展示对象
238+
*/
239+
public static ProcessNode createByEndNode(IFlowNode flowNode, boolean finish, boolean terminated) {
209240
ProcessNode processNode = new ProcessNode();
210241
processNode.setId(flowNode.getId());
211242
processNode.setNodeId(flowNode.getId());
212243
processNode.setNodeName(flowNode.getName());
213244
processNode.setNodeType(flowNode.getType());
214245
processNode.setApproveState(finish ? ApproveState.PASS : ApproveState.PENDING);
246+
processNode.setTerminated(finish && terminated);
215247
processNode.setApproveStrategy(MultiOperatorAuditStrategy.Type.SEQUENCE);
216248
processNode.setOperatorStrategy(OperatorStrategy.OPERATOR_LIST);
217249
return processNode;

‎flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,12 @@ private record ParentSubProcessContext(FlowRecord parentRecord,
476476

477477
private void loadEndNode(boolean finish) {
478478
IFlowNode endNode = this.workflow.getEndNode();
479-
this.previewNodeList.add(ProcessNode.createByEndNode(endNode, finish));
479+
// 区分正常结束与终止:EndNode 以 finish(pass) 记录终态,正常结束为 SATE_FLOW_FINISH,
480+
// 拒绝终止、异常结束时为其他终态,需要单独标记,避免展示成「已审批」
481+
boolean terminated = finish
482+
&& this.flowRecord != null
483+
&& this.flowRecord.getFlowState() != FlowRecord.SATE_FLOW_FINISH;
484+
this.previewNodeList.add(ProcessNode.createByEndNode(endNode, finish, terminated));
480485
}
481486

482487

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.flow.service;
22

3+
import com.codingapi.flow.action.ActionType;
34
import com.codingapi.flow.action.IFlowAction;
45
import com.codingapi.flow.action.actions.PassAction;
56
import com.codingapi.flow.action.actions.RejectAction;
@@ -18,6 +19,8 @@
1819
import com.codingapi.flow.pojo.body.FlowAdviceBody;
1920
import com.codingapi.flow.pojo.request.FlowActionRequest;
2021
import com.codingapi.flow.pojo.request.FlowCreateRequest;
22+
import com.codingapi.flow.pojo.request.FlowProcessNodeRequest;
23+
import com.codingapi.flow.pojo.response.ProcessNode;
2124
import com.codingapi.flow.record.FlowRecord;
2225
import com.codingapi.flow.script.factory.FlowGroovyScriptFactory;
2326
import com.codingapi.flow.strategy.node.FormFieldPermissionStrategy;
@@ -32,6 +35,7 @@
3235
import java.util.Map;
3336

3437
import static org.junit.jupiter.api.Assertions.assertEquals;
38+
import static org.junit.jupiter.api.Assertions.assertFalse;
3539
import static org.junit.jupiter.api.Assertions.assertThrows;
3640
import static org.junit.jupiter.api.Assertions.assertTrue;
3741

@@ -81,6 +85,57 @@ void reject_terminate_shouldFinishProcess() {
8185
List<FlowRecord> records = factory.flowRecordRepository.findProcessRecords(startDone.getProcessId());
8286
assertEquals(0, factory.flowRecordRepository.findTodoByOperator(boss.getUserId()).size());
8387
assertTrue(records.stream().allMatch(FlowRecord::isFinish));
88+
89+
// 流程视图需要区分「拒绝终止」与「审批通过」
90+
List<ProcessNode> nodes = factory.flowService.processNodes(
91+
new FlowProcessNodeRequest(bossTodo.getId(), boss.getUserId(), DATA));
92+
93+
ProcessNode approvalNode = nodes.stream()
94+
.filter(node -> node.getNodeId().equals(bossTodo.getNodeId()))
95+
.findFirst().orElseThrow();
96+
assertTrue(approvalNode.isRejected(), "拒绝产生的记录应标记为 rejected");
97+
assertEquals(ProcessNode.ApproveState.PASS, approvalNode.getApproveState());
98+
99+
ProcessNode endNode = nodes.stream()
100+
.filter(node -> EndNode.NODE_TYPE.equals(node.getNodeType()))
101+
.findFirst().orElseThrow();
102+
assertTrue(endNode.isTerminated(), "拒绝终止后结束节点应标记为 terminated");
103+
}
104+
105+
/**
106+
* 审批通过时,节点与结束节点都不应带拒绝/终止标记
107+
*/
108+
@Test
109+
void pass_shouldNotMarkRejectedOrTerminated() {
110+
Workflow workflow = buildWorkflow("def run(request){return 'TERMINATE'}");
111+
factory.workflowService.saveWorkflow(workflow);
112+
113+
FlowRecord startDone = submitStartToFirstApproval(workflow, user.getUserId());
114+
FlowRecord bossTodo = factory.flowRecordRepository.findTodoByOperator(boss.getUserId()).stream()
115+
.filter(record -> record.getProcessId().equals(startDone.getProcessId()))
116+
.findFirst().orElseThrow();
117+
118+
IFlowAction passAction = workflow.getFlowNode(bossTodo.getNodeId()).actionManager()
119+
.getActionByType(ActionType.PASS.name());
120+
FlowActionRequest passRequest = new FlowActionRequest();
121+
passRequest.setFormData(DATA);
122+
passRequest.setRecordId(bossTodo.getId());
123+
passRequest.setAdvice(new FlowAdviceBody(passAction.id(), "同意", boss.getUserId()));
124+
factory.flowService.action(passRequest);
125+
126+
List<ProcessNode> nodes = factory.flowService.processNodes(
127+
new FlowProcessNodeRequest(bossTodo.getId(), boss.getUserId(), DATA));
128+
129+
ProcessNode approvalNode = nodes.stream()
130+
.filter(node -> node.getNodeId().equals(bossTodo.getNodeId()))
131+
.findFirst().orElseThrow();
132+
assertFalse(approvalNode.isRejected());
133+
134+
ProcessNode endNode = nodes.stream()
135+
.filter(node -> EndNode.NODE_TYPE.equals(node.getNodeType()))
136+
.findFirst().orElseThrow();
137+
assertFalse(endNode.isTerminated());
138+
assertEquals(ProcessNode.ApproveState.PASS, endNode.getApproveState());
84139
}
85140

86141
/**

0 commit comments

Comments
 (0)