|
|
@ -560,7 +560,7 @@
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
<select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
|
<select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
|
select cd.cling_id, cd.report_date clearing_time, cd.report_date,
|
|
|
|
select cd.client_id, cd.report_date clearing_time, cd.report_date,
|
|
|
|
<if test="merge_settle!=null">
|
|
|
|
<if test="merge_settle!=null">
|
|
|
|
SUM(cd.tax_amount) as tax_amount,
|
|
|
|
SUM(cd.tax_amount) as tax_amount,
|
|
|
|
SUM(cd.total_charge) as total_charge,
|
|
|
|
SUM(cd.total_charge) as total_charge,
|
|
|
|