流程优化

hx-flow/src/main/java/com/fjhx/flow/entity/flow/vo/ApprovalRecordVo.java

@@ -100,6 +100,11 @@ public class ApprovalRecordVo {
          */
         private Long flowExampleDetailId;
 
+        /**
+         * 处理类型 1、跳转下一节点 2、结束流程 3、返回上一节点 4、退回到发起人
+         */
+        private Integer handleType;
+
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.fjhx.flow.service.flow.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -270,7 +271,7 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
         String nodeButtonSet = flowDefinitionNode.getNodeButtonSet();
         for (String buttonTypeStr : nodeButtonSet.split(",")) {
 
-            if (buttonTypeStr == null) {
+            if (StrUtil.isBlank(buttonTypeStr)) {
                 continue;
             }
 
@@ -369,6 +370,7 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
             record.setProcessedUserId(flowExampleDetail.getCreateUser());
             record.setRemark(flowExampleDetail.getHandleRemark());
             record.setFlowExampleDetailId(flowExampleDetail.getId());
+            record.setHandleType(flowExampleDetail.getHandleType());
             recordList.add(record);
         }
     }