Parcourir la source

授信管理 融资管理,补充资料审批判断是否需要平台审批

peixh il y a 3 ans
Parent
commit
9d4e2cd896

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.PubApprovalProcess;
 import com.huyi.service.base.entity.ZcFinanceInf;
+import com.huyi.service.base.entity.ZcFinanceProduct;
 import com.huyi.service.base.entity.ZcFinanceRecord;
 import com.huyi.service.base.service.IPubApprovalProcessService;
 import com.huyi.service.base.service.IZcFinanceInfService;
+import com.huyi.service.base.service.IZcFinanceProductService;
 import com.huyi.service.base.service.IZcFinanceRecordService;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
@@ -64,7 +66,8 @@ public class  FlowableController extends BaseController
     //自动生成的合同服务类
     @Autowired
     private IZcFinanceInfService zcFinanceInfService;
-
+    @Autowired
+    private IZcFinanceProductService iZcFinanceProductService;
 
 
 
@@ -185,19 +188,38 @@ public class  FlowableController extends BaseController
             ZcFinanceInf inf = zcFinanceInfService.getById(zfiId);
             //融资产品
             String zfiProductId = inf.getZfiProductId();
-            //调用平台审批
-            //查询当前操作员
-            LoginUser user = tokenService.getLoginUser();
-            String userName = user.getUsername();
-            Map map = new HashMap();
-            if (inf != null) {
-                BeanMap beanMap = BeanMap.create(inf);
-                for (Object key : beanMap.keySet()) {
-                    map.put(key + "", beanMap.get(key));
+            //查询融资产品是否需要平台审批
+            ZcFinanceProduct zcFinanceProduct = iZcFinanceProductService.getById(zfiProductId);
+            //是否需平台审批(0:不需要,1:需要)
+            String zfpPlatform = zcFinanceProduct.getZfpPlatform();
+            if ("1".equals(zfpPlatform)) {
+                //调用平台审批
+                //查询当前操作员
+                LoginUser user = tokenService.getLoginUser();
+                String userName = user.getUsername();
+                Map map = new HashMap();
+                if (inf != null) {
+                    BeanMap beanMap = BeanMap.create(inf);
+                    for (Object key : beanMap.keySet()) {
+                        map.put(key + "", beanMap.get(key));
+                    }
                 }
+                //调用平台审批
+                approvalService.addPlatformApproval(map);
+            }else {
+                ZcFinanceInf financeInf = new ZcFinanceInf();
+                //主键
+                financeInf.setZfiId(zfiId);
+                //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+                financeInf.setZfiPlatformStatus("01");
+                //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+                financeInf.setZfiSupplierStatus("01");
+                //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
+                financeInf.setZfiStatus("02");
+                //签收日期
+                financeInf.setZfiSignDate(DateUtils.getNowDate());
+                zcFinanceInfService.updateById(financeInf);
             }
-            //调用平台审批
-            approvalService.addPlatformApproval(map);
         } //平台审批通过
         else if("1000000004".equals(menuId)){
             LambdaQueryWrapper<ZcFinanceInf> wrapper = new LambdaQueryWrapper<>();
@@ -214,13 +236,7 @@ public class  FlowableController extends BaseController
             zcFinanceInf.setZfiPlatformStatus("01");
             //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
             zcFinanceInf.setZfiSupplierStatus("01");
-            Map map = new HashMap();
-            if (inf != null) {
-                BeanMap beanMap = BeanMap.create(inf);
-                for (Object key : beanMap.keySet()) {
-                    map.put(key + "", beanMap.get(key));
-                }
-            }
+            //根据融信创建类型修改融信状态
             if ("1".equals(zfiCreateType)) {
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("02");
@@ -232,6 +248,13 @@ public class  FlowableController extends BaseController
             }
             zcFinanceInfService.update(zcFinanceInf,wrapper);
             if ("2".equals(zfiCreateType)){
+                Map map = new HashMap();
+                if (inf != null) {
+                    BeanMap beanMap = BeanMap.create(inf);
+                    for (Object key : beanMap.keySet()) {
+                        map.put(key + "", beanMap.get(key));
+                    }
+                }
                 //调用核心企业确权审批
                 approvalService.coreConfirmationApproval(map);
             }

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

@@ -389,6 +389,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         JSONObject jsonObj=new JSONObject(map);
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+        //发起审批成功
         if ("200".equals(resMap.get("code"))){
             //融信id
             String zfiId = CommonUtil.objToString(map.get("zfiId"));

+ 2 - 0
sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -130,6 +130,8 @@ public class CreditLineController extends BaseController {
             m.put("zfiAmount",zfiAmount);
             //可用额度
             m.put("usableAmount",usableAmount);
+            //企业类型
+            m.put("companyType",companyType);
         }
         return R.ok(list);
     }

+ 11 - 1
sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
+import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.financeRecord.service.FinanceRecordService;
 import com.huyi.service.util.FlowableService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
@@ -96,6 +97,8 @@ public class FinanceRecordController extends BaseController {
     private FlowableService flowableService;
     @Autowired
     private IZcFinanceProComRelService iZcFinanceProComRelService;
+    @Autowired
+    private ApprovalService approvalService;
     // 开始流程
     public final static String STRART_FLOW = "flow/strartFlow";
 
@@ -141,7 +144,13 @@ public class FinanceRecordController extends BaseController {
         }else if ("03".equals(zfrQuery)){
             map.put("zfrRate", zfrValue);
         }
+
         IPage<Map> list = financeRecordService.selectFinanceRecordList(map, request);
+        List listAll = list.getRecords();
+        for (int j = 0; j < listAll.size(); j++) {
+            Map<String,String>  m = (Map<String, String>) listAll.get(j);
+            m.put("companyType",companyType);
+        }
         return R.ok(list);
     }
 
@@ -353,8 +362,9 @@ public class FinanceRecordController extends BaseController {
         //修改时间
         zcFinanceInf.setUpdateTime(DateUtils.getNowDate());
         iZcFinanceInfService.updateZcFinanceInf(zcFinanceInf);
-
         iZcFinanceRecordService.createZcFinanceRecord(zcFinanceRecord);
+        //调用融资审批
+        approvalService.addFinancingApproval(map);
         return AjaxResult.success();
     }