Merge remote-tracking branch 'origin/master'

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

@@ -124,6 +124,7 @@ public class OwnCreditController extends BaseController {
             @RequestParam (required = false) String zfiTypes,
             @RequestParam (required = false) String zfiQuery,
             @RequestParam (required = false) String zfiValue,
+            @RequestParam (required = false) String finaceStatus,
             QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
@@ -214,6 +215,8 @@ public class OwnCreditController extends BaseController {
         }else if("04".equals(zfiQuery)){
             map.put("zfiRate", zfiValue);
         }
+        //查询融信状态
+        map.put("finaceStatus", finaceStatus);
         //获取企业类型
         String companyType =  use.getCompanyType();
         map.put("companyType",companyType);

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -99,13 +99,10 @@ public class repaymentController extends BaseController {
             map.put("zfpType","0");
         }else if("01".equals(companyType)){
             map.put("coreId",company);
+            //核心企业只查反向
+            map.put("zfpType","1");
         }else if("03".equals(companyType)){
             map.put("management",company);
-            //资方查反向
-            map.put("zfpType","1");
-        }else if ("00".equals(companyType)){
-            //平台查反向
-            map.put("zfpType","1");
         }
         if(CommonUtil.isNotEmpty(type)){
             if("00".equals(type)){

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

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