委托流程异常bug修复

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

@@ -31,7 +31,6 @@ public class GuFenCharge extends NodeSwitchComponent {
     @Override
     public boolean isAccess() {
         XgfFlowDto info = this.getRequestData();
-
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
             PageData condition = new PageData();
@@ -65,12 +64,12 @@ public class GuFenCharge extends NodeSwitchComponent {
         PageData entity = xgfUserMapper.findById(condition);
 
         // 如果不是当前流程，进入下一流程判断
-        if (!"1".equals(info.getIterator())) {
+        if (!"0".equals(info.getIterator())) {
             // 根据是否有委托书判断是否走委托流程
             if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))) {
-                return "WeiTuo";
+                return "GuFenWeiTuo";
             }
-            return "JiTuanSupervise";
+            return "GuFenSupervise";
         }
 
         flows.put("APPOINT_ZERO_CORP_ID", "1");
@@ -117,7 +116,7 @@ public class GuFenCharge extends NodeSwitchComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

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

@@ -31,7 +31,6 @@ public class JiTuanCharge extends NodeSwitchComponent {
     @Override
     public boolean isAccess() {
         XgfFlowDto info = this.getRequestData();
-
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
             PageData condition = new PageData();
@@ -47,7 +46,6 @@ public class JiTuanCharge extends NodeSwitchComponent {
             xgfFlowsMapper.edit(flows);
             return false;
         }
-
         return super.isAccess();
     }
 
@@ -66,9 +64,13 @@ public class JiTuanCharge extends NodeSwitchComponent {
         condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
         PageData entity = xgfUserMapper.findById(condition);
 
+        condition.clear();
+        condition.put("XGF_USER_DETAILS_ID",flows.getString("FLOWS_ID"));
+        PageData userInfo = xgfUserDetailsMapper.findById(condition);
+
         // 如果不是当前流程，进入下一流程判断
         if (!"1".equals(info.getIterator())) {
-            if (entity.get("ATTORNEY") == null || StringUtils.isNotBlank(entity.getString("ATTORNEY"))){
+            if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))){
                 return "WeiTuo";
             }
             return "JiTuanSupervise";
@@ -95,9 +97,6 @@ public class JiTuanCharge extends NodeSwitchComponent {
             }
             // created by liu jun 2024-02-04 如果有委托书则保存委托书
             if (StringUtils.isNotBlank(info.getATTORNEY())) {
-                condition.clear();
-                condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
-                PageData userInfo = xgfUserDetailsMapper.findById(condition);
                 userInfo.put("ATTORNEY", info.getAPPOINT_ANNEX());
                 xgfUserDetailsMapper.edit(userInfo);
             }
@@ -109,7 +108,7 @@ public class JiTuanCharge extends NodeSwitchComponent {
         // 保存操作记录
         xgfUserService.saveLog(info, info.getSTATUS(), "0");
 
-        if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))){
+        if (StringUtils.isNotBlank(info.getATTORNEY())){
             return "WeiTuo";
         }
         return "JiTuanSupervise";
@@ -118,7 +117,7 @@ public class JiTuanCharge extends NodeSwitchComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

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

@@ -98,7 +98,7 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

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

@@ -32,8 +32,6 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
     @Override
     public boolean isAccess() {
         XgfFlowDto info = this.getRequestData();
-
-
         // 如果指针没有数据，赋值后自动结束
         if (StringUtils.isBlank(info.getIterator())) {
             PageData condition = new PageData();
@@ -97,7 +95,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "3".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

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

@@ -98,7 +98,7 @@ public class YiBanCharge extends NodeComponent {
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
-        if ("0".equals(info.getSTATUS())) {
+        if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
             return true;
         }
         return super.isEnd();

src/main/java/com/zcloud/flow/xgf/util/XgfFlowDto.java

@@ -2,6 +2,8 @@ package com.zcloud.flow.xgf.util;
 
 import lombok.Data;
 
+import java.util.Map;
+
 @Data
 public class XgfFlowDto {
 
@@ -41,4 +43,7 @@ public class XgfFlowDto {
 
     //委托书
     private String ATTORNEY;
+
+    // 获取节点需要填写的信息
+    private Map<String,String> map;
 }

src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml

@@ -380,7 +380,7 @@
 			or (c.APPOINT_SIX_USER_ID = #{USER_ID} and c.FLOWS_STEP = '6')
 			or (c.APPOINT_SEVEN_USER_ID = #{USER_ID} and c.FLOWS_STEP = '7')
 			)
-		and a.VALID_FLAG = '1'
+		and (a.VALID_FLAG = '1' or a.VALID_FLAG = '2')
 	</select>
 
 </mapper>