流程

hx-flow/src/main/java/com/fjhx/flow/entity/flow/po/FlowDefinition.java

@@ -48,14 +48,14 @@ public class FlowDefinition extends BaseIdPo {
      */
     private Integer currentVersion;
 
+    private String nodeObject;
+
+    private String lineObject;
+
     /**
      * 租户id
      */
     @NotBlank(message = "租户id不能为空")
     private String tenantId;
 
-    private String nodeObject;
-
-    private String lineObject;
-
 }

hx-flow/src/main/java/com/fjhx/flow/entity/flow/po/FlowDefinitionNode.java

@@ -32,12 +32,26 @@ public class FlowDefinitionNode extends BaseIdPo {
     private String nodeName;
 
     /**
-     * 节点类型 1开始 2办理 3分支 99结束
+     * 节点类型
+     * 1、开始
+     * 2、办理
+     * 3、分支
+     * 99、结束
      */
     @NotNull(message = "流程节点类型不能为空")
     private Integer nodeType;
 
     /**
+     * 节点按钮集合
+     * 1、通过
+     * 2、驳回
+     * 3、返回上一步
+     * 4、退回到发起人
+     */
+    @NotNull(message = "节点按钮集合不能为空")
+    private String nodeButtonSet;
+
+    /**
      * 跳转条件
      */
     private String jumpCondition;
@@ -54,7 +68,11 @@ public class FlowDefinitionNode extends BaseIdPo {
     private String handlingMethod;
 
     /**
-     * 发起 / 处理对象类型（1用户 2部门负责人 3部门总监 4岗位）
+     * 发起 / 处理对象类型
+     * 1、用户
+     * 2、部门负责人
+     * 3、部门总监
+     * 4、岗位
      */
     private Integer handleObjectType;
 

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -572,7 +572,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
      * <p>
      * templateStr: ${Integer.parseInt(a)+1};  ${a+1};  ${b.tt};  ${b.vv};  ${b.vv[0]};
      * map:         {a: "1", b: {tt: "t", vv: ["aa", "bb", "cc"] }}
-     * result:      2;  11;  t;  ["aa","bb","cc"];  aa;
+     * return:      2;  11;  t;  ["aa","bb","cc"];  aa;
      *
      * @param templateStr 模板字符串
      * @param map         替换参数