|
|
|
@@ -539,7 +539,7 @@ |
|
|
|
max(case oweList.bill_type when '欠缴押金' then oweList.pay else 0 end) depositPay, |
|
|
|
max(case oweList.bill_type when '其他费用' then oweList.pay else 0 end) otherPay |
|
|
|
from( |
|
|
|
select bill.tenant_id,bill.merchant_id,bill.bill_type,sum(owe) owe,bill.receive_date,bill.expired_day,bill.receive_pay,bill.pay from ( |
|
|
|
select bill.tenant_id,bill.merchant_id,bill.bill_type,sum(owe) owe,bill.receive_date,bill.expired_day,sum(bill.receive_pay) receive_pay,sum(bill.pay) pay from ( |
|
|
|
|
|
|
|
select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' |
|
|
|
bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' |
|
|
|
|