|
|
|
@@ -117,11 +117,11 @@ |
|
|
|
<if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if> |
|
|
|
|
|
|
|
<if test=" null != merchantIds "> |
|
|
|
and br.merchant_id in |
|
|
|
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> |
|
|
|
#{midItem} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
and br.merchant_id in |
|
|
|
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> |
|
|
|
#{midItem} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
</where> |
|
|
|
</sql> |
|
|
|
|
|
|
|
@@ -130,14 +130,8 @@ |
|
|
|
case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, |
|
|
|
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, |
|
|
|
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime, |
|
|
|
br.freeze,br.service_charge_pay,br.manage_fee_type |
|
|
|
|
|
|
|
r.merchant_name,r.type as rent_type,r.`late_pay_ratio` |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio` |
|
|
|
from wx_bill_rent_manage br |
|
|
|
left join wx_rent_contract r on br.rent_contract_id=r.id |
|
|
|
<include refid="queryBillManageListConditions"/> |
|
|
|
<if test=" null != sortColumns">order by ${sortColumns}</if> |
|
|
|
<if test="null != limitStart and null != limitEnd"> |
|
|
|
|