Repository navigation
Commit 4b57e94
committed
fix: 流程节点记录区分拒绝与终止(rejected / terminated)
- ProcessNode 新增 rejected / terminated 响应字段,拒绝记录与通过记录不再无法区分
- FlowProcessNodeService 依据 flowState 判定结束节点是否为非正常结束(拒绝终止、异常)
- FlowRejectTerminateTest 补充终止与通过场景断言,框架全量 337 个测试通过
- 无数据结构变更,判定基于既有 actionType / flowState,历史数据无需迁移
- 更新 flow-frontend 子模块至 337b0f7
关联:#2411 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
- service/impl
- test/java/com/codingapi/flow/service
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
70 | 87 | | |
71 | 88 | | |
72 | 89 | | |
| |||
113 | 130 | | |
114 | 131 | | |
115 | 132 | | |
| 133 | + | |
| 134 | + | |
116 | 135 | | |
117 | 136 | | |
118 | 137 | | |
| |||
206 | 225 | | |
207 | 226 | | |
208 | 227 | | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
209 | 240 | | |
210 | 241 | | |
211 | 242 | | |
212 | 243 | | |
213 | 244 | | |
214 | 245 | | |
| 246 | + | |
215 | 247 | | |
216 | 248 | | |
217 | 249 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
476 | 476 | | |
477 | 477 | | |
478 | 478 | | |
479 | | - | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
480 | 485 | | |
481 | 486 | | |
482 | 487 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| 22 | + | |
| 23 | + | |
21 | 24 | | |
22 | 25 | | |
23 | 26 | | |
| |||
32 | 35 | | |
33 | 36 | | |
34 | 37 | | |
| 38 | + | |
35 | 39 | | |
36 | 40 | | |
37 | 41 | | |
| |||
81 | 85 | | |
82 | 86 | | |
83 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
84 | 139 | | |
85 | 140 | | |
86 | 141 | | |
| |||
Submodule flow-frontend updated 10 files
- packages/flow-mobile/flow-mobile-approval/CHANGELOG.md+1
- packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-node-history.tsx+4
- packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-time-node.tsx+20
- packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow_node_history.module.scss+11
- packages/flow-mobile/flow-mobile-approval/tests/index.test.tsx+35
- packages/flow-pc/flow-pc-approval/CHANGELOG.md+1
- packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/flow-time-node.tsx+24-2
- packages/flow-pc/flow-pc-approval/tests/index.test.tsx+51
- packages/flow-types/CHANGELOG.md+1
- packages/flow-types/src/types/flow-approval.ts+4
0 commit comments