Commit b6d0176186c77af8ef3053c818932dd6fac1b8f3
1 parent
4958aaea
【代码评审】BPM:review 仿钉钉流程设计 - 调整排他网关和条件节点
Showing
2 changed files
with
4 additions
and
1 deletions
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionType.java
| @@ -15,11 +15,11 @@ public enum BpmSimpleModeConditionType { | @@ -15,11 +15,11 @@ public enum BpmSimpleModeConditionType { | ||
| 15 | 15 | ||
| 16 | CUSTOM_EXPRESSION(1, "自定义条件表达式"); | 16 | CUSTOM_EXPRESSION(1, "自定义条件表达式"); |
| 17 | 17 | ||
| 18 | - | ||
| 19 | private final Integer type; | 18 | private final Integer type; |
| 20 | private final String name; | 19 | private final String name; |
| 21 | 20 | ||
| 22 | public static BpmSimpleModeConditionType valueOf(Integer type) { | 21 | public static BpmSimpleModeConditionType valueOf(Integer type) { |
| 23 | return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values()); | 22 | return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values()); |
| 24 | } | 23 | } |
| 24 | + | ||
| 25 | } | 25 | } |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/SimpleModelConstants.java
| @@ -13,6 +13,8 @@ public interface SimpleModelConstants { | @@ -13,6 +13,8 @@ public interface SimpleModelConstants { | ||
| 13 | */ | 13 | */ |
| 14 | String APPROVE_METHOD_ATTRIBUTE = "approveMethod"; | 14 | String APPROVE_METHOD_ATTRIBUTE = "approveMethod"; |
| 15 | 15 | ||
| 16 | + // TODO @芋艿:条件表达式的字段名 | ||
| 17 | + | ||
| 16 | /** | 18 | /** |
| 17 | * 网关节点默认序列流属性 | 19 | * 网关节点默认序列流属性 |
| 18 | */ | 20 | */ |
| @@ -27,4 +29,5 @@ public interface SimpleModelConstants { | @@ -27,4 +29,5 @@ public interface SimpleModelConstants { | ||
| 27 | * 条件节点条件表达式属性 | 29 | * 条件节点条件表达式属性 |
| 28 | */ | 30 | */ |
| 29 | String CONDITION_EXPRESSION_ATTRIBUTE = "conditionExpression"; | 31 | String CONDITION_EXPRESSION_ATTRIBUTE = "conditionExpression"; |
| 32 | + | ||
| 30 | } | 33 | } |