融资管理查询条件

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

@@ -115,7 +115,8 @@ public class FinanceRecordController extends BaseController {
     public R list(@RequestParam (required = false) String zfrTypes,
                   @RequestParam (required = false) String zfrQuery,
                   @RequestParam (required = false) String zfrValue,
-                  @RequestParam (required = false) String zfrStatus,QueryRequest request) {
+                  @RequestParam (required = false) String zfrStatus,
+                  @RequestParam (required = false) Map dataTime,QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser user = userInfo.getSysUser();
@@ -130,10 +131,10 @@ public class FinanceRecordController extends BaseController {
         //企业类型
         map.put("companyType",companyType);
         map.put("zfrStatus",zfrStatus);
-        //00:我签收的   01:我开立的
-        if ("00".equals(zfrTypes)){
+        //01:我签收的   02:我开立的
+        if ("01".equals(zfrTypes)){
             map.put("zfiSupplierId",zfrTypes);
-        }else if ("01".equals(zfrTypes)){
+        }else if ("02".equals(zfrTypes)){
             map.put("zfiCoreId",zfrTypes);
         }
         //00:按开立企业名称查询 01:按融信编号查询 02:按融资编号查询 03:按融资状态查询 04:按接收企业名称查询
@@ -148,7 +149,9 @@ public class FinanceRecordController extends BaseController {
         }else if("04".equals(zfrQuery)){
             map.put("supplierScyName", zfrValue);
         }
-
+        //承诺还款时间区间
+        map.put("startTime",dataTime.get("zfrRepaymentDate[0]"));
+        map.put("endTime",dataTime.get("zfrRepaymentDate[1]"));
         IPage<Map> list = financeRecordService.selectFinanceRecordList(map, request);
         List listAll = list.getRecords();
         for (int j = 0; j < listAll.size(); j++) {

sc-service/src/main/resources/mapper/financeRecord/FinanceRecordMapper.xml

@@ -80,6 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="paramMap.zfrRate != null  and paramMap.zfrRate != ''">
             and r.zfr_rate = #{paramMap.zfrRate}
         </if>
+        <if test="paramMap.startTime != null  and paramMap.startTime != ''">
+            and r.zfr_repayment_date &gt;= #{paramMap.endTime}
+        </if>
+        <if test="paramMap.endTime != null  and paramMap.endTime != ''">
+            and r.zfr_repayment_date &lt;=  #{paramMap.endTime}
+        </if>
         order by r.create_time desc
     </select>
     <select id="selectBillInfList" parameterType="map" resultType="map">

sc-service/src/main/resources/mapper/supplierCreditLine/SupplierCreditLineMapper.xml

@@ -34,12 +34,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSupplierCreditLineDetail" parameterType="map" resultType="map">
         SELECT
-        zfsq_id         'zfsqId',
-        zfsq_company_id 'zfsqCompanyId',
-        zfsq_amount     'zfsqAmount',
-        zfsq_status     'zfsqStatus',
-        scy_name        'scyName',
-        scy_social_code 'scySocialCode'
+        zfsq_id             'zfsqId',
+        zfsq_company_id     'zfsqCompanyId',
+        zfsq_amount         'zfsqAmount',
+        zfsq_status         'zfsqStatus',
+        zfsq_account        'zfsqAccount',
+        zfsq_account_bank   'zfsqAccountBank',
+        scy_name            'scyName',
+        scy_social_code     'scySocialCode'
         FROM zc_finance_supplier_quota
         LEFT JOIN sys_company ON scy_id = zfsq_company_id
         WHERE 1=1