|
|
@ -91,11 +91,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
<select id="listClientSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
|
<select id="listClientSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
|
select
|
|
|
|
select
|
|
|
|
*,DATE_FORMAT(report_date,'%y-%m-%d')clear_date,DATE_FORMAT(settle_date_from,'%m-%d')settle_from,DATE_FORMAT(settle_date_to,'%m-%d')settle_to
|
|
|
|
cd.*,DATE_FORMAT(cd.report_date,'%y-%m-%d')clear_date,DATE_FORMAT(cd.settle_date_from,'%m-%d')settle_from,DATE_FORMAT(cd.settle_date_to,'%m-%d')settle_to,
|
|
|
|
FROM log_clearing_detail
|
|
|
|
c.editable
|
|
|
|
|
|
|
|
FROM log_clearing_detail cd
|
|
|
|
|
|
|
|
inner join log_clearing c on c.clearing_id=cd.clearing_id
|
|
|
|
<where>
|
|
|
|
<where>
|
|
|
|
<if test="client_ids!=null">
|
|
|
|
<if test="client_ids!=null">
|
|
|
|
AND client_id IN
|
|
|
|
AND cd.client_id IN
|
|
|
|
<foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
|
|
|
|
<foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
|
|
|
|
#{client_id}
|
|
|
|
#{client_id}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
@ -103,8 +105,8 @@
|
|
|
|
<if test="client_ids==null and client_id !=null">
|
|
|
|
<if test="client_ids==null and client_id !=null">
|
|
|
|
and client_id=#{client_id}
|
|
|
|
and client_id=#{client_id}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="begin!=null">and report_date >= #{begin}</if>
|
|
|
|
<if test="begin!=null">and cd.report_date >= #{begin}</if>
|
|
|
|
<if test="end!=null">and report_date <= #{end}</if>
|
|
|
|
<if test="end!=null">and cd.report_date <= #{end}</if>
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
<select id="batchReport" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
|
<select id="batchReport" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
|