融信

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

@@ -4,6 +4,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.credit.service.OwnCreditService;
 import com.huyi.service.util.FlowableService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
@@ -76,7 +77,9 @@ public class OwnCreditController extends BaseController {
     private IZcBillFileRelService billFileRelService;
     @Autowired
     private FlowableService flowableService;
-
+    //审批服务类
+    @Autowired
+    private ApprovalService approvalService;
 
     /**
      * 查询融信信息
@@ -118,7 +121,20 @@ public class OwnCreditController extends BaseController {
         //融信编号
         map.put("zfiNumber", zfiNumber);
         //状态
-        map.put("zfiStatus", zfiStatus);
+        if(!CommonUtil.isEmpty(zfiStatus)){
+            List<String> stateList = new ArrayList<>();
+            if(!zfiStatus.contains(",")){
+                stateList.add(zfiStatus);
+            }else{
+                String arr [] = zfiStatus.split(",");
+                for(int i = 0 ; i < arr.length;i++){
+                    if(!CommonUtil.isEmpty(arr[i])){
+                        stateList.add(arr[i]);
+                    }
+                }
+            }
+            map.put("stateList",CommonUtil.listToStr4InSql(stateList));
+        }
         //开立企业
         map.put("openCompany", openCompany);
         //接收企业
@@ -755,6 +771,13 @@ public class OwnCreditController extends BaseController {
         }
         //插入数据
         financeInfService.createZcFinanceInf(inf);
+        //核心开立
+        if("1".equals(type)){
+            map.put("zfiId",id);
+            map.put("zfiCoreId",companyId);
+            //调用核心开立审批流
+            approvalService.coreApproval(CommonUtil.entityToMap(inf));
+        }
         return AjaxResult.success();
     }
 

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

@@ -138,7 +138,12 @@ public class OwnMessageController extends BaseController {
         //发送短信验证码
         JSONObject jsonObject =  CfcaUtil.sendSmsCode(false,institutionId,"",iphone,"");
         //获取结果
-        String result = jsonObject.getString("Status");
+        String result = "";
+        try {
+            result = jsonObject.getString("Status");
+        }catch (Exception e){
+        }
+
         //手机号掩码
         String newIphone = iphone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
         Map<String,String > map = new HashMap<>();

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and f.zfi_number like concat('%', #{paramMap.zfiNumber}, '%')
         </if>
 
-        <if test="paramMap.zfiStatus != null  and paramMap.zfiStatus != ''">
-            and f.zfi_status = #{paramMap.zfiStatus}
+        <if test="paramMap.stateList != null  and paramMap.stateList != ''">
+            and f.zfi_status IN (${paramMap.stateList})
         </if>
 
         <if test="paramMap.openCompany != null  and paramMap.openCompany != ''">