融信新增调用审批

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

@@ -310,7 +310,7 @@ public class OwnCreditController extends BaseController {
         ZcFinanceInf inf = new ZcFinanceInf();
         //主键
         inf.setZfiId(id);
-        //非开立
+        //不是供应商申请
         if(!"0".equals(type)){
             //获取之前的融信编号
             String zfiNumber = CommonUtil.objToString(map.get("zfiNumber"));
@@ -676,25 +676,6 @@ public class OwnCreditController extends BaseController {
         inf.setZfiRate(zfiRate);
         //核心开立
         if("1".equals(type)){
-            //根据有无审批流做判断
-            Map<String,Object> pp = new HashMap<>();
-            pp.put("menuId","1000000000");
-            pp.put("companyId",companyId);
-            Map<String,Object> mmp = flowableService.selectApproval(pp);
-            //不等于200
-           if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
-                    throw  new Exception("查询审批流程失败");
-            }
-            List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
-           //未开启流程审批
-            if(list.size() < 1){
-                //通过
-                inf.setZfiCoreStatus("01");
-            }else{
-                //核心企业状态--暂存
-                inf.setZfiCoreStatus("03");
-            }
-
             //接收企业
             String zfiSupplierId = CommonUtil.objToString(map.get("zfiSupplierId"));
             inf.setZfiSupplierId(zfiSupplierId);
@@ -725,24 +706,6 @@ public class OwnCreditController extends BaseController {
             String checkTotalAmt = CommonUtil.objToString(map.get("checkTotalAmt"));
             //供应商开立
             if("2".equals(type)){
-                //根据有无审批流做判断
-                Map<String,Object> pp = new HashMap<>();
-                pp.put("menuId","1000000001");
-                pp.put("companyId",companyId);
-                Map<String,Object> mmp = flowableService.selectApproval(pp);
-                //不等于200
-                if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
-                    throw  new Exception("查询审批流程失败");
-                }
-                List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
-                //未开启流程审批
-                if(list.size() < 1){
-                    //通过
-                    inf.setZfiSupplierStatus("01");
-                }else{
-                    //供应商企业状态--暂存
-                    inf.setZfiSupplierStatus("03");
-                }
                 //供应商企业授信额度
                 String zfiSupplierQuotaId = CommonUtil.objToString(map.get("zfiSupplierQuotaId"));
                 inf.setZfiSupplierQuotaId(zfiSupplierQuotaId);
@@ -765,26 +728,6 @@ public class OwnCreditController extends BaseController {
                 if(!"0".equals(zfpcrLoanType)){
                     inf.setZfiCollectionAccount(zfiCollectionAccount);
                 }*/
-            }else if("0".equals(type)){//供应商申请
-                //根据有无审批流做判断
-                Map<String,Object> pp = new HashMap<>();
-                pp.put("menuId","1000000002");
-                pp.put("companyId",companyId);
-                Map<String,Object> mmp = flowableService.selectApproval(pp);
-                //不等于200
-                if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
-                    throw  new Exception("查询审批流程失败");
-                }
-                List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
-                //未开启流程审批
-                if(list.size() < 1){
-                    //通过
-                    inf.setZfiSupplierStatus("01");
-                }else{
-                    //供应商企业状态--暂存
-                    inf.setZfiSupplierStatus("03");
-                }
-
             }
             if(CommonUtil.compare(zfiAmount,checkTotalAmt) == 1){
                 throw new Exception("签发金额不可大于合计金额");
@@ -828,7 +771,23 @@ public class OwnCreditController extends BaseController {
             map.put("zfiId",id);
             map.put("zfiCoreId",companyId);
             //调用核心开立审批流
-            approvalService.coreApproval(CommonUtil.entityToMap(inf));
+            approvalService.coreApproval(map);
+        }else if("2".equals(type)){
+            //供应商开立
+            map.put("zfiId",id);
+            map.put("zfiSupplierId",companyId);
+            //融信编号
+            map.put("ZfiNumber",inf.getZfiNumber());
+            //调用融资立审批流
+            approvalService.financeOpenApproval(map);
+        }else if("0".equals(type)){
+            //供应商申请
+            map.put("zfiId",id);
+            map.put("zfiSupplierId",companyId);
+            //融信编号
+            map.put("ZfiNumber",inf.getZfiNumber());
+            //调用融资申请审批流
+            approvalService.financeApplyApproval(map);
         }
         return AjaxResult.success();
     }