修改付款申请网关

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java

@@ -69,6 +69,8 @@ public class FinPaymentapply extends BaseEntity {
     private String costRangeValue;
     @ApiModelProperty("是否事业部领导审批，1是0否")
     private String isLeaderSp;
+    @ApiModelProperty("是否事业部总经理审批，1是0否")
+    private String isManageSp;
     @ApiModelProperty("是否已销售，1是0否")
     private String isSales;
     @ApiModelProperty("款项是否已交清，1是0否")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -28,11 +28,8 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -112,6 +109,8 @@ public class FinPaymentapplyDetailsVo implements Vo {
     private String costRangeValue;
     @ApiModelProperty("是否事业部领导审批，1是0否")
     private String isLeaderSp;
+    @ApiModelProperty("是否事业部总经理审批，1是0否")
+    private String isManageSp;
     @ApiModelProperty("是否已销售，1是0否")
     private String isSales;
     @ApiModelProperty("款项是否已交清，1是0否")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -113,6 +113,8 @@ public class FinPaymentapplyDto implements Dto {
     private String costRangeValue;
     @ApiModelProperty("是否事业部领导审批，1是0否")
     private String isLeaderSp;
+    @ApiModelProperty("是否事业部总经理审批，1是0否")
+    private String isManageSp;
     @ApiModelProperty("是否已销售，1是0否")
     private String isSales;
     @ApiModelProperty("款项是否已交清，1是0否")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -458,18 +458,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         variables.put("app", appMap);
         //网关
         finPaymentapply = fetchBySid(businessSid);
-        if ("1".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsSettle())) {
-                variables.put("isAdj", false);
-            } else {
-                variables.put("isAdj", true);
-            }
-        } else if ("0".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsLeaderSp())) {
+        if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+            if (finPaymentapply.getIsLeaderSp().equals("1")) {
                 variables.put("isAdj", true);
             } else {
                 variables.put("isAdj", false);
             }
+        } else {
+            variables.put("isAdj", false);
+        }
+        if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+            if (finPaymentapply.getIsManageSp().equals("1")) {
+                variables.put("isManageSp", true);
+            } else {
+                variables.put("isManageSp", false);
+            }
+        } else {
+            variables.put("isManageSp", false);
         }
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
@@ -607,25 +612,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         FinPaymentapply finPaymentapply = fetchBySid(bv.getBusinessSid());
         bv.setModelId(finPaymentapply.getProcDefId());
         if (bv.getTaskId().equals(finPaymentapply.getTaskId())) {
-            Map<String, Object> vaributes = new HashMap<>();
+            Map<String, Object> variables = new HashMap<>();
             //网关
-            if ("1".equals(finPaymentapply.getIsVeh())) {
-                if ("1".equals(finPaymentapply.getIsSettle())) {
-                    vaributes.put("isAdj", false);
+            if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+                if (finPaymentapply.getIsLeaderSp().equals("1")) {
+                    variables.put("isAdj", true);
                 } else {
-                    vaributes.put("isAdj", true);
+                    variables.put("isAdj", false);
                 }
-            } else if ("0".equals(finPaymentapply.getIsVeh())) {
-                if ("1".equals(finPaymentapply.getIsLeaderSp())) {
-                    vaributes.put("isAdj", true);
+            } else {
+                variables.put("isAdj", false);
+            }
+            if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+                if (finPaymentapply.getIsManageSp().equals("1")) {
+                    variables.put("isManageSp", true);
                 } else {
-                    vaributes.put("isAdj", false);
+                    variables.put("isManageSp", false);
                 }
+            } else {
+                variables.put("isManageSp", false);
             }
             Map<String, Object> appMap = new HashMap<>();
             appMap.put("sid", bv.getBusinessSid());
-            vaributes.put("app", appMap);
-            bv.setFormVariables(vaributes);
+            variables.put("app", appMap);
+            bv.setFormVariables(variables);
             bv.setOrgSidPath(finPaymentapply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -775,18 +785,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         //查询业务信息
         FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
         //网关
-        if ("1".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsSettle())) {
-                variables.put("isAdj", false);
-            } else {
-                variables.put("isAdj", true);
-            }
-        } else if ("0".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsLeaderSp())) {
+        if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+            if (finPaymentapply.getIsLeaderSp().equals("1")) {
                 variables.put("isAdj", true);
             } else {
                 variables.put("isAdj", false);
             }
+        } else {
+            variables.put("isAdj", false);
+        }
+        if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+            if (finPaymentapply.getIsManageSp().equals("1")) {
+                variables.put("isManageSp", true);
+            } else {
+                variables.put("isManageSp", false);
+            }
+        } else {
+            variables.put("isManageSp", false);
         }
         bv.setModelId(finPaymentapply.getProcDefId());
         bv.setFormVariables(variables);
@@ -812,18 +827,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         //查询业务信息
         FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
         //网关
-        if ("1".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsSettle())) {
-                variables.put("isAdj", false);
-            } else {
-                variables.put("isAdj", true);
-            }
-        } else if ("0".equals(finPaymentapply.getIsVeh())) {
-            if ("1".equals(finPaymentapply.getIsLeaderSp())) {
+        if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+            if (finPaymentapply.getIsLeaderSp().equals("1")) {
                 variables.put("isAdj", true);
             } else {
                 variables.put("isAdj", false);
             }
+        } else {
+            variables.put("isAdj", false);
+        }
+        if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+            if (finPaymentapply.getIsManageSp().equals("1")) {
+                variables.put("isManageSp", true);
+            } else {
+                variables.put("isManageSp", false);
+            }
+        } else {
+            variables.put("isManageSp", false);
         }
         bv.setModelId(finPaymentapply.getProcDefId());
         bv.setFormVariables(variables);
@@ -858,25 +878,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
-                Map<String, Object> vaributes = new HashMap<>();
+                Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", query.getBusinessSid());
-                vaributes.put("app", appMap);
+                variables.put("app", appMap);
                 //网关
-                if ("1".equals(finPaymentapply.getIsVeh())) {
-                    if ("1".equals(finPaymentapply.getIsSettle())) {
-                        vaributes.put("isAdj", false);
+                if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
+                    if (finPaymentapply.getIsLeaderSp().equals("1")) {
+                        variables.put("isAdj", true);
                     } else {
-                        vaributes.put("isAdj", true);
+                        variables.put("isAdj", false);
                     }
-                } else if ("0".equals(finPaymentapply.getIsVeh())) {
-                    if ("1".equals(finPaymentapply.getIsLeaderSp())) {
-                        vaributes.put("isAdj", true);
+                } else {
+                    variables.put("isAdj", false);
+                }
+                if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
+                    if (finPaymentapply.getIsManageSp().equals("1")) {
+                        variables.put("isManageSp", true);
                     } else {
-                        vaributes.put("isAdj", false);
+                        variables.put("isManageSp", false);
                     }
+                } else {
+                    variables.put("isManageSp", false);
                 }
-                flowTaskVo.setValues(vaributes);
+                flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());

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

@@ -23,7 +23,7 @@ public enum ProcDefEnum {
     //    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"),
     FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
-    FINPAYAPPLY("付款申请", "process_gin2tntb:6:16692504"),
+    FINPAYAPPLY("付款申请", "process_gin2tntb:7:18505004"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),