|
@@ -40,7 +40,7 @@
|
|
pc.item_id,
|
|
pc.item_id,
|
|
pc.NAME,
|
|
pc.NAME,
|
|
pc.payment_date,
|
|
pc.payment_date,
|
|
- fc.claim_amount,
|
|
|
|
|
|
+ pc.amount as claimAmount,
|
|
fc.claim_datetime ,
|
|
fc.claim_datetime ,
|
|
frf.payer,
|
|
frf.payer,
|
|
frf.pay_datetime,
|
|
frf.pay_datetime,
|
|
@@ -87,9 +87,9 @@
|
|
</foreach>
|
|
</foreach>
|
|
</if>
|
|
</if>
|
|
<if test="dto!=null and dto.startDate!=null and dto.endDate!=null">
|
|
<if test="dto!=null and dto.startDate!=null and dto.endDate!=null">
|
|
- AND pc.created BETWEEN #{dto.startDate} AND #{dto.endDate}
|
|
|
|
|
|
+ AND fc.claim_datetime BETWEEN #{dto.startDate} AND #{dto.endDate}
|
|
</if>
|
|
</if>
|
|
- order by pc.payment_date DESC
|
|
|
|
|
|
+ order by fc.claim_datetime DESC
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
<select id="page" parameterType="com.dayou.vo.PaymentCollectionVO" resultType="com.dayou.vo.PaymentCollectionVO">
|
|
<select id="page" parameterType="com.dayou.vo.PaymentCollectionVO" resultType="com.dayou.vo.PaymentCollectionVO">
|