|
|
@ -593,9 +593,9 @@
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="from!=null">and cd.report_date >= #{from}</if>
|
|
|
|
<if test="from!=null">and cd.report_date >= #{from}</if>
|
|
|
|
<if test="to!=null">and cd.report_date < #{to}</if>
|
|
|
|
<if test="to!=null">and cd.report_date < #{to}</if>
|
|
|
|
<if test="merge_settle!=null">GROUP BY report_date</if>
|
|
|
|
<if test="merge_settle!=null">GROUP BY cd.report_date</if>
|
|
|
|
<if test="merge_settle==null">GROUP BY clear_detail_id</if>
|
|
|
|
<if test="merge_settle==null">GROUP BY cd.clear_detail_id</if>
|
|
|
|
order by clearing_id desc
|
|
|
|
order by c.clearing_id desc
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|