平台调用融资/确权审批

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

@@ -39,6 +39,8 @@ public class ApprovalServiceImpl implements ApprovalService {
 
     @Autowired
     private ISysUserService iSysUserService;
+    @Autowired
+    private ApprovalService approvalService;
     /**
      * 平台审批
      * @param map
@@ -84,13 +86,17 @@ 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);
                 //核心企业确权审批
-                //coreConfirmationApproval(map);
+                coreConfirmationApproval(map);
             }
-            zcFinanceInfService.updateById(zcFinanceInf);
+
         }else if (!"200".equals(resMap.get("code"))) {
             throw new Exception(resMap.get("message").toString());
         }
@@ -114,7 +120,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQuery);
         String userId = String.valueOf(userList.get(0).getSucrUserId());
         SysUser sysUser = iSysUserService.getById(userId);
-        String userName = sysUser.getUserName();
+        String userName = sysUser.getNickName();
         //查询当前操作员
         flowParam.put("menuId", "1000000007");
         flowParam.put("companyId", zfiCoreId);
@@ -161,7 +167,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         String userId= String.valueOf(userList.get(0).getSucrUserId());
         //查询用户名称
         SysUser sysUser = iSysUserService.getById(userId);
-        String userName =  sysUser.getUserName();
+        String userName =  sysUser.getNickName();
         //查询当前操作员
         flowParam.put("menuId", "1000000005");
         flowParam.put("companyId", companyId);
@@ -220,7 +226,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         }
         //查询用户名称
         SysUser sysUser = iSysUserService.getById(userId);
-        String userName =  sysUser.getUserName();
+        String userName =  sysUser.getNickName();
         //查询当前操作员
         flowParam.put("menuId", "1000000006");
         flowParam.put("companyId", companyId);