流程

hx-flow/src/main/java/com/fjhx/flow/core/FlowThreadLocalUtil.java

@@ -1,7 +1,6 @@
 package com.fjhx.flow.core;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.enums.HandleTypeEnum;
 import org.springframework.core.NamedThreadLocal;
 
@@ -46,11 +45,6 @@ public class FlowThreadLocalUtil {
     private HandleTypeEnum handleTypeEnum;
 
     /**
-     * 流程状态
-     */
-    private FlowStatusEnum flowStatusEnum;
-
-    /**
      * 下个节点审批用户id
      */
     private Long nextHandleUserId;

hx-flow/src/main/java/com/fjhx/flow/enums/HandleObjectTypeEnum.java

@@ -15,7 +15,7 @@ public enum HandleObjectTypeEnum {
     DETP_LEADER(2, "部门负责人"),
     DEPT_DIRECTOR(3, "部门总监"),
     POST(4, "岗位"),
-    ROLE(5, "角色")
+    ROLE(5, "角色"),
     ;
 
     private final Integer key;

hx-flow/src/main/java/com/fjhx/flow/enums/HandleTypeEnum.java

@@ -11,14 +11,10 @@ import java.util.Map;
 @AllArgsConstructor
 public enum HandleTypeEnum {
 
-    // 跳转下一节点
-    NEXT(1, "通过"),
-    // 结束流程
+    SKIP_TO_NEXT(1, "通过"),
     REJECT(2, "驳回"),
-    // 返回上一节点
-    PREVIOUS(3, "返回上一步"),
-    // 退回到发起人
-    RETURN_TO_SPONSOR(4, "退回到发起人"),
+    RETURN_TO_PREVIOUS(3, "返回上一步"),
+    RETURN_TO_SUBMITTER(4, "退回到发起人"),
     ;
 
     private final Integer key;

hx-flow/src/main/java/com/fjhx/flow/enums/NodeTypeEnum.java

@@ -14,7 +14,8 @@ public enum NodeTypeEnum {
     START(1, "开始"),
     HANDLE(2, "办理"),
     BRANCH(3, "分支"),
-    END(99, "结束");
+    END(99, "结束"),
+    ;
 
     private final Integer key;
 

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

@@ -145,7 +145,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         startExampleDetail.setFlowExampleId(flowId);
         startExampleDetail.setFlowDefinitionNodeId(startNode.getId());
         startExampleDetail.setFlowDefinitionNodeType(startNode.getNodeType());
-        startExampleDetail.setHandleType(HandleTypeEnum.NEXT.getKey());
+        startExampleDetail.setHandleType(HandleTypeEnum.SKIP_TO_NEXT.getKey());
         startExampleDetail.setHandleRemark(dto.getRemark());
         startExampleDetail.setSubmitData(JSONObject.toJSONString(dto));
         flowExampleDetailList.add(startExampleDetail);
@@ -163,7 +163,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             endExampleDetail.setFlowExampleId(flowId);
             endExampleDetail.setFlowDefinitionNodeId(nextUserNode.getId());
             endExampleDetail.setFlowDefinitionNodeType(nextUserNode.getNodeType());
-            endExampleDetail.setHandleType(HandleTypeEnum.NEXT.getKey());
+            endExampleDetail.setHandleType(HandleTypeEnum.SKIP_TO_NEXT.getKey());
             flowExampleDetailList.add(endExampleDetail);
         }
 
@@ -236,7 +236,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         switch (handleTypeEnum) {
 
             // 跳转下一节点
-            case NEXT:
+            case SKIP_TO_NEXT:
 
                 // 寻找下一节点
                 nextUserNode = getNextUserNode(currentNode, flowDefinitionNodeList);
@@ -273,7 +273,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                 break;
 
             // 返回上一节点
-            case PREVIOUS:
+            case RETURN_TO_PREVIOUS:
 
                 // 查找上一个节点
                 FlowExampleDetail lastOneFlowExampleDetail = getLastOneUserNode(flowId);
@@ -294,7 +294,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                 break;
 
             // 退回到发起人
-            case RETURN_TO_SPONSOR:
+            case RETURN_TO_SUBMITTER:
 
                 // 获取第一个用户操作节点
                 FlowExampleDetail exampleDetail = flowExampleDetailService.getOne(q -> q
@@ -344,7 +344,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             endExampleDetail.setFlowExampleId(flowId);
             endExampleDetail.setFlowDefinitionNodeId(nextUserNode.getId());
             endExampleDetail.setFlowDefinitionNodeType(nextUserNode.getNodeType());
-            endExampleDetail.setHandleType(HandleTypeEnum.NEXT.getKey());
+            endExampleDetail.setHandleType(HandleTypeEnum.SKIP_TO_NEXT.getKey());
             flowExampleDetailList.add(endExampleDetail);
 
         }
@@ -574,7 +574,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
      * @param map         替换参数
      * @return 替换后的字符串
      */
-    private static String templateParse(String templateStr, Map<String, Object> map) {
+    private String templateParse(String templateStr, Map<String, Object> map) {
         Pattern pattern = Pattern.compile("\\$\\{(.*?)}");
         Matcher matcher = pattern.matcher(templateStr);
         StringBuffer sr = new StringBuffer();