fix:信用卡账单功能完善。

intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="posCount"    column="pos_count"    />
         <result property="dailyExpensesCount"    column="daily_expenses_count"   />
+        <result property="availableLimit"    column="available_limit"    />
+        <result property="payDate"    column="pay_date"    />
     </resultMap>
 
     <sql id="selectCreditCardBillVo">
@@ -40,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.bill_state,
         a.remark,
         bc."name" as bank_name,
+        bc.pay_date,
         bc.code as bank_code,
+        a2.available_limit,
         (
         select
         count(*)
@@ -83,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         credit_card_bill a
         left join bank_card_lend bc on
         bc.id = a.credit_card_id
+        left join accounts a2 on a2.id =a.credit_card_id
     </sql>
 
     <select id="selectCreditCardBillList" parameterType="CreditCardBillDto" resultMap="CreditCardBillResult">

intc-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml

@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by
-        a.query_institution desc
+        a.query_date desc
 
     </select>
 </mapper>

intc-modules/intc-invest/src/main/resources/mapper/invest/FutureBaseInforMapper.xml

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and a.name like '%'|| #{name}||'%'</if>
             <if test="code != null  and code != ''"> and a.code = #{code}</if>
             <if test="standardId != null "> and a.standard_id = #{standardId}</if>
+            <if test="lastTradingDay!=null and lastTradingDay !=''">
+                and to_char(a.last_trading_day, 'yyyy-MM-dd')>=#{lastTradingDay}
+            </if>
         </where>
         order by a.create_time desc
     </select>