平台审批/确权审批

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -119,7 +119,8 @@ public class  FlowableController extends BaseController
             if("0".equals(type)){
                 approvalService.addSignApproval(CommonUtil.entityToMap(zcFinanceInf));
             }else if("2".equals(type)){
-                approvalService.addFinancingApproval(CommonUtil.entityToMap(zcFinanceInf));
+                zcFinanceInf.setZfiStatus("02");
+                zcFinanceInfService.updateById(zcFinanceInf);
             }
         }
         //融资企业融信申请审批通过
@@ -217,13 +218,12 @@ public class  FlowableController extends BaseController
             if ("1".equals(zfiCreateType)) {
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("02");
-                zcFinanceInfService.update(zcFinanceInf,wrapper);
-                //调用融资审批
-                approvalService.addFinancingApproval(map);
             }else if ("0".equals(zfiCreateType) || "2".equals(zfiCreateType)){
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("00");
-                zcFinanceInfService.update(zcFinanceInf,wrapper);
+            }
+            zcFinanceInfService.update(zcFinanceInf,wrapper);
+            if ("2".equals(zfiCreateType)){
                 //调用核心企业确权审批
                 approvalService.coreConfirmationApproval(map);
             }

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -86,17 +86,15 @@ public class ApprovalServiceImpl implements ApprovalService {
             if ("1".equals(zfiCreateType)) {
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("02");
-                zcFinanceInfService.updateById(zcFinanceInf);
-                //调用融资审批
-                addFinancingApproval(map);
             }else if ("0".equals(zfiCreateType) || "2".equals(zfiCreateType)){
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("00");
-                zcFinanceInfService.updateById(zcFinanceInf);
-                //核心企业确权审批
+            }
+            zcFinanceInfService.updateById(zcFinanceInf);
+            if ("2".equals(zfiCreateType)){
+                //调用核心企业确权审批
                 coreConfirmationApproval(map);
             }
-
         }else if (!"200".equals(resMap.get("code"))) {
             throw new Exception(resMap.get("message").toString());
         }
@@ -141,7 +139,8 @@ public class ApprovalServiceImpl implements ApprovalService {
                 if("0".equals(type)){
                     addSignApproval(map);
                 }else if("2".equals(type)){
-                    addFinancingApproval(map);
+                    zcFinanceInf.setZfiStatus("02");
+                    zcFinanceInfService.updateById(zcFinanceInf);
                 }
             }else if ("450".equals(resMap.get("code"))) {
                 throw new Exception("未配置审批流程");