融资审批提交

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

@@ -415,13 +415,13 @@ public class ApprovalServiceImpl implements ApprovalService {
         flowParam.put("menuId", "1000000006");
         flowParam.put("companyId", companyId);
         //双主键
-        flowParam.put("businessKey", CommonUtil.objToString(map.get("zfiId")));
+        flowParam.put("businessKey", CommonUtil.objToString(map.get("zfrId")));
         //员工id
         flowParam.put("sessionUserId",  userId);
         //融信编号
-        String zfiNumber = CommonUtil.objToString(map.get("zfiNumber"));
-        if(CommonUtil.isNotEmpty(zfiNumber)) {
-            flowParam.put("name",userName + DateUtils.getTime() + "发起审批,融信编号为:" + CommonUtil.objToString(map.get("zfiNumber"))+"的融资审批");
+        String zfrId = CommonUtil.objToString(map.get("zfrId"));
+        if(CommonUtil.isNotEmpty(zfrId)) {
+            flowParam.put("name",userName + DateUtils.getTime() + "发起审批,融资编号为:" + zfrId+"的融资审批");
         }else {
             flowParam.put("name",userName + DateUtils.getTime() + "发起融资审批");
         }
@@ -430,7 +430,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
         if ("200".equals(resMap.get("code"))){
             ZcFinanceInf zfi = new ZcFinanceInf();
-            zfi.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            zfi.setZfiId(CommonUtil.objToString(map.get("zfrId")));
             //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
             zfi.setZfiStatus("04");
             zcFinanceInfService.updateById(zfi);
@@ -447,12 +447,12 @@ public class ApprovalServiceImpl implements ApprovalService {
         if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //融信id
-            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfrId")));
             //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
             zcFinanceInf.setZfiStatus("04");
             zcFinanceInfService.updateById(zcFinanceInf);
             LambdaQueryWrapper<ZcFinanceRecord> zcFinanceRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            zcFinanceRecordLambdaQueryWrapper.eq(ZcFinanceRecord::getZfrFinanceId,CommonUtil.objToString(map.get("zfiId")));
+            zcFinanceRecordLambdaQueryWrapper.eq(ZcFinanceRecord::getZfrFinanceId,CommonUtil.objToString(map.get("zfrId")));
             ZcFinanceRecord zcFinanceRecord = new ZcFinanceRecord();
             //融资状态(00:融资中 01:已放款 02:融资失败 03:已结算)
             zcFinanceRecord.setZfrStatus("00");

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

@@ -373,6 +373,7 @@ public class FinanceRecordController extends BaseController {
         iZcFinanceInfService.updateZcFinanceInf(zcFinanceInf);
         iZcFinanceRecordService.createZcFinanceRecord(zcFinanceRecord);
         //调用融资审批
+        map.put("zfrId",zfrId);
         approvalService.addFinancingApproval(map);
         return AjaxResult.success();
     }