|
|
|
@@ -826,21 +826,22 @@ |
|
|
|
from ( |
|
|
|
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' |
|
|
|
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' |
|
|
|
endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime from wx_bill_rent_deposit where |
|
|
|
endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze from wx_bill_rent_deposit where |
|
|
|
tenant_id=#{tenantId} |
|
|
|
union all |
|
|
|
select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' |
|
|
|
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' |
|
|
|
endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime from wx_bill_property_deposit where |
|
|
|
endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze from wx_bill_property_deposit where |
|
|
|
tenant_id=#{tenantId} |
|
|
|
union all |
|
|
|
select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as |
|
|
|
bill_type,0 as |
|
|
|
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, |
|
|
|
rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime |
|
|
|
rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime,freeze |
|
|
|
from wx_bill_other_deposit where tenant_id=#{tenantId} |
|
|
|
) bill |
|
|
|
where 1=1 |
|
|
|
<if test=" null != freeze"> and bill.freeze = #{freeze} </if> |
|
|
|
<if test=" null != status"> and bill.status = #{status} </if> |
|
|
|
<if test=" null != merchantId">and bill.merchant_id=#{merchantId}</if> |
|
|
|
</select> |
|
|
|
|