Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java

@@ -37,4 +37,6 @@ public class BaseDistributorCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;
+    @ApiModelProperty(value = "是否能判定 01是 02否")
+    private String isDecided;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -17,6 +17,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -206,8 +207,12 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     public ResultBean complete(BaseDistributorCompleteDto dto) {
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(dto, bv);
+        String isDecide = "";
+        if (StringUtils.isNotBlank(dto.getIsDecided())) {
+            isDecide = dto.getIsDecided();
+        }
         bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
-        return baseDistributorService.complete(bv);
+        return baseDistributorService.complete(bv,isDecide);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1223,7 +1223,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             bv.setTaskDefKey(baseDistributor2.getNodeSid());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            return complete(bv, "");
         }
         return rb;
     }
@@ -1238,9 +1238,19 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         return baseMapper.updateFlowFiled(map);
     }
 
-    public ResultBean complete(BusinessVariables bv) {
+    public ResultBean complete(BusinessVariables bv, String isDecide) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
+        //增加网关判断
+        boolean isDecided = true;
+        if (StringUtils.isNotBlank(isDecide)) {
+            if ("02".equals(isDecide)) {
+                isDecided = false;
+            }
+        }
+        Map<String, Object> formVariables = new HashMap<>();
+        formVariables.put("isDecide", isDecided);
+        bv.setFormVariables(formVariables);
         BaseDistributor baseDistributor = this.fetchBySid(businessSid);
         if (bv.getTaskId().equals(baseDistributor.getTaskId())) {
             bv.setOrgSidPath(baseDistributor.getOrgSidPath());
@@ -1420,7 +1430,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             bv.setTaskDefKey(baseDistributor.getNodeSid());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            return complete(bv, "");
         }
         return rb;
     }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -52,7 +52,7 @@ public enum ProcDefEnum {
     LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
     LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
     LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:1:2847504"),
-    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"),
+    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:6:4827504"),
     LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
     LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"),
     BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:1:4825004"),