|
|
|
@@ -605,7 +605,7 @@ |
|
|
|
res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type from( |
|
|
|
select id,merchant_id,shop_id,tenant_id,'其他费用' name,5 bill_type_value,'其他费用' bill_type,0 as |
|
|
|
need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type |
|
|
|
from wx_bill_daily where type in(1,2) and tenant_id = #{tenantId} |
|
|
|
from wx_bill_daily where type in(1,2,3) and tenant_id = #{tenantId} |
|
|
|
<include refid="getOweBillAsPageConditions"/> |
|
|
|
union |
|
|
|
select id,merchant_id,shop_id,tenant_id,'其他费用' name,7 bill_type_value,'其他费用' bill_type,0 as |
|
|
|
|