1、自测流程混乱bug修复

2、页面按钮样式调整

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java

@@ -1,15 +1,14 @@
 package com.zcloud.flow.xgf.GuFen;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.core.NodeSwitchComponent;
 import com.zcloud.entity.PageData;
-import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
+import com.zcloud.flow.xgf.util.XgfFlowDto;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
@@ -30,18 +29,14 @@ public class GuFenCharge extends NodeSwitchComponent {
     private XgfUserDetailsMapper xgfUserDetailsMapper;
 
     @Override
-    public String processSwitch() throws Exception {
+    public boolean isAccess() {
-        System.out.println("GuFenCharge" + "节点");
-
-
         XgfFlowDto info = this.getRequestData();
-        PageData condition = new PageData();
-
-        condition.put("FLOWS_ID", info.getFLOWS_ID());
-        PageData flows = xgfFlowsMapper.findById(condition);
 
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
             info.setIterator("0");
             flows.put("APPOINT_ZERO_CORP_TYPE", "0");
             flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
@@ -50,8 +45,20 @@ public class GuFenCharge extends NodeSwitchComponent {
             flows.put("APPOINT_ZERO_USER_NAME", info.getAPPOINT_USER_NAME());
             flows.put("FLOWS_STEP", 0);
             xgfFlowsMapper.edit(flows);
-            return "";
+            return false;
         }
+        return super.isAccess();
+    }
+
+    @Override
+    public String processSwitch() throws Exception {
+        System.out.println(getName() + "节点");
+
+        XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
 
         condition.clear();
         condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
@@ -59,7 +66,8 @@ public class GuFenCharge extends NodeSwitchComponent {
 
         // 如果不是当前流程，进入下一流程判断
         if (!"1".equals(info.getIterator())) {
-            if (entity.get("ATTORNEY") == null || StringUtils.isNotBlank(entity.getString("ATTORNEY"))){
+            // 根据是否有委托书判断是否走委托流程
+            if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))) {
                 return "WeiTuo";
             }
             return "JiTuanSupervise";
@@ -100,9 +108,9 @@ public class GuFenCharge extends NodeSwitchComponent {
         // 保存操作记录
         xgfUserService.saveLog(info, info.getSTATUS(), "0");
 
-        if (entity.get("ATTORNEY") == null || StringUtils.isNotBlank(entity.getString("ATTORNEY"))){
+        if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))) {
-            return "WeiTuo";
+            return "GuFenWeiTuo";
         }
-        return "JiTuanSupervise";
+        return "GuFenSupervise";
     }
 }

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java

@@ -3,16 +3,17 @@ package com.zcloud.flow.xgf.GuFen;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.zcloud.entity.PageData;
-import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
+import com.zcloud.flow.xgf.util.XgfFlowDto;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 
 @LiteflowComponent("GuFenSupervise")
+@SuppressWarnings("all")
 public class GuFenSupervise extends NodeComponent {
 
     @Resource
@@ -24,9 +25,31 @@ public class GuFenSupervise extends NodeComponent {
     @Resource
     private XgfUserMapper xgfUserMapper;
 
+    @Override
+    public boolean isAccess() {
+        XgfFlowDto info = this.getRequestData();
+
+        // 如果指针没有数据，赋值后自动结束
+        if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
+            info.setIterator("2");
+            flows.put("APPOINT_ONE_CORP_TYPE", "0");
+            flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
+            flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
+            flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
+            flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
+            flows.put("FLOWS_STEP", 1);
+            xgfFlowsMapper.edit(flows);
+            return false;
+        }
+        return "1".equals(info.getIterator());
+    }
+
     @Override
     public void process() throws Exception {
-        System.out.println("GuFenSupervise" + "节点");
+        System.out.println(getName() + "节点");
 
 
         XgfFlowDto info = this.getRequestData();
@@ -39,23 +62,6 @@ public class GuFenSupervise extends NodeComponent {
             throw new RuntimeException("系统异常");
         }
 
-        // 如果指针没有数据，赋值后自动结束
-        if (StringUtils.isBlank(info.getIterator())) {
-            info.setIterator("2");
-            flows.put("APPOINT_ONE_CORP_TYPE", "0");
-            flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
-            flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
-            flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
-            flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
-            flows.put("FLOWS_STEP", 1);
-            xgfFlowsMapper.edit(flows);
-            return;
-        }
-
-        // 如果不是当前流程，进入下一流程判断
-        if (!"2".equals(info.getIterator())) {
-            return;
-        }
         flows.put("APPOINT_ONE_CORP_ID", "1");
         flows.put("APPOINT_ONE_CORP_NAME", "秦港股份有限公司");
         flows.put("APPOINT_ONE_TIME", DateUtil.getTime());

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoCharge.java

@@ -3,13 +3,13 @@ package com.zcloud.flow.xgf.GuFen;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.zcloud.entity.PageData;
-import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
+import com.zcloud.flow.xgf.util.XgfFlowDto;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
@@ -29,10 +29,32 @@ public class GuFenWeiTuoCharge extends NodeComponent {
     @Resource
     private CorpInfoMapper corpInfoMapper;
 
+    @Override
+    public boolean isAccess() {
+        XgfFlowDto info = this.getRequestData();
+
+        // 如果指针没有数据，赋值后自动结束
+        if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
+            info.setIterator("1");
+            flows.put("APPOINT_ONE_CORP_TYPE", "0");
+            flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
+            flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
+            flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
+            flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
+            flows.put("FLOWS_STEP", 1);
+            xgfFlowsMapper.edit(flows);
+            return false;
+        }
+        return "1".equals(info.getIterator());
+    }
+
     @Override
     public void process() throws Exception {
 
-        System.out.println("GuFenWeiTuoCharge" + "节点");
+        System.out.println(getName() + "节点");
 
 
         XgfFlowDto info = this.getRequestData();

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java

@@ -3,18 +3,19 @@ package com.zcloud.flow.xgf.GuFen;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.zcloud.entity.PageData;
-import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
+import com.zcloud.flow.xgf.util.XgfFlowDto;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 
 @LiteflowComponent("GuFenWeiTuoSupervise")
+@SuppressWarnings("all")
 public class GuFenWeiTuoSupervise extends NodeComponent {
 
     @Resource
@@ -30,18 +31,13 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
     private CorpInfoMapper corpInfoMapper;
 
     @Override
-    public void process() throws Exception {
+    public boolean isAccess() {
-
-        System.out.println("GuFenWeiTuoSupervise" + "节点");
-
         XgfFlowDto info = this.getRequestData();
-        PageData condition = new PageData();
-
-        condition.put("FLOWS_ID", info.getFLOWS_ID());
-        PageData flows = xgfFlowsMapper.findById(condition);
-
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
             info.setIterator("2");
             flows.put("APPOINT_TWO_CORP_TYPE", "0");
             flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
@@ -50,13 +46,20 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
             flows.put("APPOINT_TWO_USER_NAME", info.getAPPOINT_USER_NAME());
             flows.put("FLOWS_STEP", 2);
             xgfFlowsMapper.edit(flows);
-            return;
+            return false;
         }
-        // 如果不是当前流程，进入下一流程判断
+        return "2".equals(info.getIterator());
-        if (!"3".equals(info.getIterator())) {
-            return;
     }
 
+    @Override
+    public void process() throws Exception {
+        System.out.println(getName() + "节点");
+        XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
+
         condition.clear();
         condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         PageData corpEntity = corpInfoMapper.findById(condition);
@@ -85,6 +88,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
 
             // 保存操作记录
             xgfUserService.saveLog(info, info.getSTATUS(), "1");
+            info.setIterator("");
         }
 
     }

src/main/java/com/zcloud/flow/xgf/InitCompany.java

@@ -2,11 +2,8 @@ package com.zcloud.flow.xgf;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeSwitchComponent;
-import com.zcloud.entity.PageData;
 import com.zcloud.flow.xgf.util.XgfFlowDto;
 
-import java.util.Map;
-
 @LiteflowComponent("InitCompany")
 public class InitCompany extends NodeSwitchComponent {
     @Override

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanCharge.java

@@ -1,18 +1,14 @@
 package com.zcloud.flow.xgf.JiTuan;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.core.NodeIfComponent;
 import com.yomahub.liteflow.core.NodeSwitchComponent;
 import com.zcloud.entity.PageData;
 import com.zcloud.flow.xgf.util.XgfFlowDto;
-import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
-import com.zcloud.util.Jurisdiction;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
@@ -33,18 +29,14 @@ public class JiTuanCharge extends NodeSwitchComponent {
     private XgfUserDetailsMapper xgfUserDetailsMapper;
 
     @Override
-    @SuppressWarnings("all")
+    public boolean isAccess() {
-    public String processSwitch() throws Exception {
-        System.out.println("JiTuanCharge"+"节点");
-
         XgfFlowDto info = this.getRequestData();
-        PageData condition = new PageData();
-
-        condition.put("FLOWS_ID", info.getFLOWS_ID());
-        PageData flows = xgfFlowsMapper.findById(condition);
 
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
             info.setIterator("1");
             flows.put("APPOINT_ONE_CORP_TYPE", "0");
             flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
@@ -53,9 +45,23 @@ public class JiTuanCharge extends NodeSwitchComponent {
             flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
             flows.put("FLOWS_STEP", 1);
             xgfFlowsMapper.edit(flows);
-            return "";
+            return false;
         }
 
+        return super.isAccess();
+    }
+
+    @Override
+    @SuppressWarnings("all")
+    public String processSwitch() throws Exception {
+        System.out.println(getName()+ "节点");
+
+        XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
+
         condition.clear();
         condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
         PageData entity = xgfUserMapper.findById(condition);
@@ -103,7 +109,7 @@ public class JiTuanCharge extends NodeSwitchComponent {
         // 保存操作记录
         xgfUserService.saveLog(info, info.getSTATUS(), "0");
 
-        if (entity.get("ATTORNEY") == null || StringUtils.isNotBlank(entity.getString("ATTORNEY"))){
+        if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))){
             return "WeiTuo";
         }
         return "JiTuanSupervise";

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java

@@ -24,9 +24,34 @@ public class JiTuanSupervise extends NodeComponent {
     @Resource
     private XgfUserMapper xgfUserMapper;
 
+    @Override
+    public boolean isAccess() {
+
+        XgfFlowDto info = this.getRequestData();
+
+        // 如果指针没有数据，赋值后自动结束
+        if (StringUtils.isBlank(info.getIterator())) {
+            info.setIterator("2");
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
+            flows.put("APPOINT_TWO_CORP_TYPE", "0");
+            flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
+            flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
+            flows.put("APPOINT_TWO_USER_ID", info.getAPPOINT_USER_ID());
+            flows.put("APPOINT_TWO_USER_NAME", info.getAPPOINT_USER_NAME());
+            flows.put("FLOWS_STEP", 2);
+            xgfFlowsMapper.edit(flows);
+            return false;
+        }
+
+        // 如果不是当前流程，进入下一流程判断
+        return "2".equals(info.getIterator());
+    }
+
     @Override
     public void process() throws Exception {
-        System.out.println("JiTuanSupervise"+"节点");
+        System.out.println(getName() + "节点");
 
         XgfFlowDto info = this.getRequestData();
         PageData condition = new PageData();
@@ -37,24 +62,6 @@ public class JiTuanSupervise extends NodeComponent {
         if (flows == null || flows.size() == 0) {
             throw new RuntimeException("系统异常");
         }
-
-        // 如果指针没有数据，赋值后自动结束
-        if (StringUtils.isBlank(info.getIterator())) {
-            info.setIterator("2");
-            flows.put("APPOINT_TWO_CORP_TYPE", "0");
-            flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
-            flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
-            flows.put("APPOINT_TWO_USER_ID", info.getAPPOINT_USER_ID());
-            flows.put("APPOINT_TWO_USER_NAME", info.getAPPOINT_USER_NAME());
-            flows.put("FLOWS_STEP", 2);
-            xgfFlowsMapper.edit(flows);
-            return;
-        }
-
-        // 如果不是当前流程，进入下一流程判断
-        if (!"2".equals(info.getIterator())) {
-            return;
-        }
         flows.put("APPOINT_TWO_CORP_ID", "1");
         flows.put("APPOINT_TWO_CORP_NAME", "秦港股份有限公司");
         flows.put("APPOINT_TWO_TIME", DateUtil.getTime());

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoCharge.java

@@ -30,17 +30,14 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
     private CorpInfoMapper corpInfoMapper;
 
     @Override
-    public void process() throws Exception {
+    public boolean isAccess() {
-        System.out.println("JiTuanWeiTuoCharge"+"节点");
-
         XgfFlowDto info = this.getRequestData();
-        PageData condition = new PageData();
-
-        condition.put("FLOWS_ID", info.getFLOWS_ID());
-        PageData flows = xgfFlowsMapper.findById(condition);
 
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
             info.setIterator("2");
             flows.put("APPOINT_TWO_CORP_TYPE", "0");
             flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
@@ -49,13 +46,22 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
             flows.put("APPOINT_TWO_USER_NAME", info.getAPPOINT_USER_NAME());
             flows.put("FLOWS_STEP", 2);
             xgfFlowsMapper.edit(flows);
-            return;
+            return false;
         }
-        // 如果不是当前流程，进入下一流程判断
+
-        if (!"2".equals(info.getIterator())) {
+        return "2".equals(info.getIterator());
-            return;
     }
 
+    @Override
+    public void process() throws Exception {
+        System.out.println(getName() + "节点");
+
+        XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
+
         condition.clear();
         condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         PageData corpEntity = corpInfoMapper.findById(condition);

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java

@@ -30,17 +30,15 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
     private CorpInfoMapper corpInfoMapper;
 
     @Override
-    public void process() throws Exception {
+    public boolean isAccess() {
-        System.out.println("JiTuanWeiTuoSupervise"+"节点");
-
         XgfFlowDto info = this.getRequestData();
-        PageData condition = new PageData();
 
-        condition.put("FLOWS_ID", info.getFLOWS_ID());
-        PageData flows = xgfFlowsMapper.findById(condition);
 
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
+            PageData condition = new PageData();
+            condition.put("FLOWS_ID", info.getFLOWS_ID());
+            PageData flows = xgfFlowsMapper.findById(condition);
             info.setIterator("3");
             flows.put("APPOINT_THREE_CORP_TYPE", "0");
             flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
@@ -49,13 +47,21 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
             flows.put("APPOINT_THREE_USER_NAME", info.getAPPOINT_USER_NAME());
             flows.put("FLOWS_STEP", 3);
             xgfFlowsMapper.edit(flows);
-            return;
+            return false;
         }
-        // 如果不是当前流程，进入下一流程判断
+        return "3".equals(info.getIterator());
-        if (!"3".equals(info.getIterator())) {
-            return;
     }
 
+    @Override
+    public void process() throws Exception {
+        System.out.println(getName() + "节点");
+
+        XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
+
         condition.clear();
         condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         PageData corpEntity = corpInfoMapper.findById(condition);

src/main/java/com/zcloud/flow/xgf/YiBan/YiBanCharge.java

@@ -3,19 +3,15 @@ package com.zcloud.flow.xgf.YiBan;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.zcloud.entity.PageData;
-import com.zcloud.flow.xgf.util.XgfFlowDto;
-import com.zcloud.flow.xgf.util.XgfUtil;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
+import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
-import com.zcloud.util.HttpClientService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 
 import javax.annotation.Resource;
-import java.util.Map;
 
 @LiteflowComponent("YiBanCharge")
 public class YiBanCharge extends NodeComponent {
@@ -29,27 +25,39 @@ public class YiBanCharge extends NodeComponent {
     @Resource
     private XgfUserDetailsMapper xgfUserDetailsMapper;
 
-    @Value("${preventionxgf.api.url}")
-    private String prevention_xgf_url;
 
     @Resource
     private XgfUserService xgfUserService;
 
+    @Override
+    public boolean isAccess() {
+
+        XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
+
+        // 如果指针没有数据，赋值后自动结束
+        if (StringUtils.isBlank(info.getIterator())) {
+            info.setIterator("0");
+            flows.put("APPOINT_ZERO_CORP_TYPE", "0");
+            flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
+            flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
+            flows.put("APPOINT_ZERO_USER_ID", info.getAPPOINT_USER_ID());
+            flows.put("APPOINT_ZERO_USER_NAME", info.getAPPOINT_USER_NAME());
+            flows.put("FLOWS_STEP", 0);
+            xgfFlowsMapper.edit(flows);
+            return false;
+        }
+        // 如果不是当前流程，进入下一流程判断
+        return "0".equals(info.getIterator());
+    }
 
     @Override
     public void process() throws Exception {
         System.out.println("YiBanCharge节点");
         XgfFlowDto info = this.getRequestData();
         PageData condition = new PageData();
-        // 如果指针没有数据，赋值后自动结束
-        if (StringUtils.isBlank(info.getIterator())) {
-            info.setIterator("0");
-            return;
-        }
-        // 如果不是当前流程，进入下一流程判断
-        if (!"0".equals(info.getIterator())) {
-            return;
-        }
         condition.put("FLOWS_ID", info.getFLOWS_ID());
         PageData flows = xgfFlowsMapper.findById(condition);
 

src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java

@@ -3,10 +3,10 @@ package com.zcloud.flow.xgf.YiBan;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.zcloud.entity.PageData;
-import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
 import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper;
 import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
+import com.zcloud.flow.xgf.util.XgfFlowDto;
 import com.zcloud.service.xgf.XgfUserService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
@@ -31,13 +31,48 @@ public class YiBanSupervise extends NodeComponent {
     private CorpInfoMapper corpInfoMapper;
 
     @Override
-    public void process() throws Exception {
+    public boolean isAccess() {
-        System.out.println("YiBanSupervise节点");
         XgfFlowDto info = this.getRequestData();
+        PageData condition = new PageData();
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
 
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
             info.setIterator("1");
+            flows.put("APPOINT_ONE_CORP_TYPE", "0");
+            flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
+            flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
+            flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
+            flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
+            flows.put("FLOWS_STEP", 1);
+            xgfFlowsMapper.edit(flows);
+            return false;
+        }
+
+        return "1".equals(info.getIterator());
+    }
+
+    @Override
+    public void process() throws Exception {
+        System.out.println(getName());
+        XgfFlowDto info = this.getRequestData();
+
+        PageData condition = new PageData();
+
+        condition.put("FLOWS_ID", info.getFLOWS_ID());
+        PageData flows = xgfFlowsMapper.findById(condition);
+
+        // 如果指针没有数据，赋值后自动结束
+        if (StringUtils.isBlank(info.getIterator())) {
+            info.setIterator("1");
+            flows.put("APPOINT_ONE_CORP_TYPE", "0");
+            flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getAPPOINT_DEPARTMENT_ID());
+            flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getAPPOINT_DEPARTMENT_NAME());
+            flows.put("APPOINT_ONE_USER_ID", info.getAPPOINT_USER_ID());
+            flows.put("APPOINT_ONE_USER_NAME", info.getAPPOINT_USER_NAME());
+            flows.put("FLOWS_STEP", 1);
+            xgfFlowsMapper.edit(flows);
             return;
         }
         // 如果不是当前流程，进入下一流程判断
@@ -45,11 +80,6 @@ public class YiBanSupervise extends NodeComponent {
             return;
         }
 
-        PageData condition = new PageData();
-
-        condition.put("FLOWS_ID", info.getFLOWS_ID());
-        PageData flows = xgfFlowsMapper.findById(condition);
-
         condition.clear();
         condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         PageData corpEntity = corpInfoMapper.findById(condition);

src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java

@@ -888,6 +888,7 @@ public class XgfUserServiceImpl implements XgfUserService {
         flow.put("APPOINT_SIX_USER_ID", "");
         flow.put("APPOINT_SEVEN_USER_ID", "");
     }
+
     public void saveLog(PageData info, String status, String endFlag) throws Exception {
         /* 保存审批记录 */
         PageData condition = new PageData();
@@ -1013,6 +1014,8 @@ public class XgfUserServiceImpl implements XgfUserService {
                 e.printStackTrace();
                 System.out.println(response.getMessage());
                 throw new RuntimeException("系统异常");
+            } else {
+                System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
             }
         }
 

src/main/resources/application-dev.properties

@@ -128,3 +128,6 @@ mq.gwj.file.topic=czks_dockingPicture
 cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
 #河北秦安文件服务器前缀
 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
+
+liteflow.rule-source=flow.xml
+liteflow.print-execution-log=false

src/main/resources/flow.xml

@@ -12,7 +12,7 @@
         ).id("JiTuan"),
         SWITCH(GuFenCharge).to(
             GuFenSupervise,
-            THEN(GuFenWeiTuoCharge,GuFenWeiTuoSupervise).id("WeiTuo")
+            THEN(GuFenWeiTuoCharge,GuFenWeiTuoSupervise).id("GuFenWeiTuo")
         ).DEFAULT(DefaultNode).id("GuFen")
         );
     </chain>