确权，签收调用审批，盖章节点修改

sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -164,7 +164,8 @@ public class CreditHandleController extends BaseController {
                 //签收日期
                 financeInf.setZfiSignDate(createTime);
             }
-            //TODo 调用审批流
+            approvalService.coreConfirmationApproval(map);
+
         }else if("01".equals(flag)){//拒绝
             //已失效
             //TODo 给融资方经办人添加失效消息
@@ -293,7 +294,12 @@ public class CreditHandleController extends BaseController {
             financeInf.setZfiStatus("03");
         }
         financeInfService.updateById(financeInf);
-        //TODo 调用签收审批流
+        //通过
+        if("00".equals(flag)){
+            // 调用签收审批流
+            approvalService.addSignApproval(map);
+        }
+
         return AjaxResult.success();
     }
 
@@ -434,15 +440,17 @@ public class CreditHandleController extends BaseController {
         String coreStatus = financeInf.getZfiCoreStatus();
         //获取融资方审批状态
         String supplierStatus = financeInf.getZfiSupplierStatus();
+        //平台审批状态
+        String zfiPlatformStatus = financeInf.getZfiPlatformStatus();
         //节点
         String code = "";
         //供应商申请
         if("0".equals(createType)){
             if("00".equals(status) && "01".equals(coreStatus)){
-                //开立确权
+                //确权
                 code = "02";
             }
-            if("01".equals(status) && "01".equals(supplierStatus)){
+            if("01".equals(status) && "01".equals(supplierStatus) && "01".equals(zfiPlatformStatus)){
                 //签收
                 code = "00";
             }
@@ -450,10 +458,10 @@ public class CreditHandleController extends BaseController {
         //核心开立
         if("1".equals(createType)){
             if(CommonUtil.isEmpty(status) && "01".equals(coreStatus)){
-                //开立确权
+                //开立
                 code = "02";
             }
-            if("01".equals(status) && "01".equals(supplierStatus)){
+            if("01".equals(status) && "01".equals(supplierStatus) && "01".equals(zfiPlatformStatus)){
                 //签收
                 code = "00";
             }
@@ -461,7 +469,7 @@ public class CreditHandleController extends BaseController {
 
         //供应商开立
         if("2".equals(createType)){
-            if(CommonUtil.isEmpty(status) && "01".equals(supplierStatus)){
+            if(CommonUtil.isEmpty(status) && "01".equals(supplierStatus) && "01".equals(zfiPlatformStatus)){
                 //融资开立
                 code = "03";
             }

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -767,7 +767,6 @@ public class OwnCreditController extends BaseController {
         //插入数据
         financeInfService.createZcFinanceInf(inf);
         //核心开立
-        //TODO  申请融信  调用陈浩融资申请审批流   融信开立  调用陈浩的融信开立审批流
         if("1".equals(type)){
             map.put("zfiId",id);
             map.put("zfiCoreId",companyId);

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -252,15 +252,17 @@ public class OwnMessageController extends BaseController {
         String coreStatus = financeInf.getZfiCoreStatus();
         //获取融资方审批状态
         String supplierStatus = financeInf.getZfiSupplierStatus();
+        //平台审批状态
+        String zfiPlatformStatus = financeInf.getZfiPlatformStatus();
         //节点
         String code = "";
         //供应商申请
         if("0".equals(createType)){
             if("00".equals(status) && "01".equals(coreStatus)){
-                //开立确权
+                //确权
                 code = "02";
             }
-            if("01".equals(status) && "01".equals(supplierStatus)){
+            if("01".equals(status) && "01".equals(supplierStatus) && "01".equals(zfiPlatformStatus)){
                 //签收
                 code = "00";
             }
@@ -268,10 +270,10 @@ public class OwnMessageController extends BaseController {
         //核心开立
         if("1".equals(createType)){
             if(CommonUtil.isEmpty(status) && "01".equals(coreStatus)){
-                //开立确权
+                //开立
                 code = "02";
             }
-            if("01".equals(status) && "01".equals(supplierStatus)){
+            if("01".equals(status) && "01".equals(supplierStatus) && "01".equals(zfiPlatformStatus)){
                 //签收
                 code = "00";
             }
@@ -279,7 +281,7 @@ public class OwnMessageController extends BaseController {
 
         //供应商开立
         if("2".equals(createType)){
-            if(CommonUtil.isEmpty(status) && "01".equals(supplierStatus)){
+            if(CommonUtil.isEmpty(status) && "01".equals(supplierStatus) && "01".equals(zfiPlatformStatus)){
                 //融资开立
                 code = "03";
             }