|
|
|
@ -593,8 +593,8 @@
|
|
|
|
|
<if test="client_ids==null and client_id !=null">
|
|
|
|
|
and (sc.client_id=#{client_id} or sc.parent_client_id =#{client_id})
|
|
|
|
|
</if>
|
|
|
|
|
<if test="from!=null">and t.transaction_time >= #{from}</if>
|
|
|
|
|
<if test="to!=null">and t.transaction_time < #{to}</if>
|
|
|
|
|
<if test="from!=null">and cd.report_date >= DATE_FORMAT(#{from},'%Y-%m-%d')</if>
|
|
|
|
|
<if test="to!=null">and cd.report_date < DATE_FORMAT(#{to},'%Y-%m-%d')</if>
|
|
|
|
|
<if test="merge_settle!=null">GROUP BY report_date</if>
|
|
|
|
|
<if test="merge_settle==null">GROUP BY t.order_id</if>
|
|
|
|
|
order by t.clearing_time desc
|
|
|
|
|