|
|
@@ -275,7 +275,7 @@
|
|
|
pba.state as state,
|
|
|
(select label from pay_sys_dict where value = pba.state and type='客户状态' and site_id = #{siteId} and customer_id = #{customerId}) stateName,
|
|
|
|
|
|
- IFNULL(dt.remaining,0),
|
|
|
+ dt.remaining ,
|
|
|
(select label from pay_sys_dict where value = pba.idtype and type='证件类型' and site_id = #{siteId} and customer_id = #{customerId}) idTypeName,
|
|
|
pba.accountnumber,
|
|
|
pba.name,
|
|
|
@@ -286,19 +286,19 @@
|
|
|
left join (
|
|
|
select
|
|
|
account_id,
|
|
|
- sum(payamount) sum_payamount
|
|
|
+ ifnull(sum(payamount),0) sum_payamount
|
|
|
from pay_amount_waterusedamount
|
|
|
where site_id = #{siteId} and customer_id = #{customerId} and year=#{year} and month=#{month}
|
|
|
group by account_id
|
|
|
) paw on paw.account_id = pba.id
|
|
|
left join (
|
|
|
select
|
|
|
- rece.account_id
|
|
|
- ,max(rech.remaining) - sum(rece.debt) remaining
|
|
|
+ rech.account_id
|
|
|
+ ,IFNULL(max(rech.remaining),0) - IFNULL(sum(rece.debt),0) remaining
|
|
|
from pay_pay_rechargeaccount rech
|
|
|
- left join pay_pay_receivable rece on rece.account_id=rech.account_id
|
|
|
- where rech.site_id = #{siteId} and rech.customer_id = #{customerId} and rece.debt>0
|
|
|
- group by rece.account_id
|
|
|
+ left join pay_pay_receivable rece on rece.account_id=rech.account_id and rece.debt>0
|
|
|
+ where rech.site_id = #{siteId} and rech.customer_id = #{customerId}
|
|
|
+ group by rech.account_id
|
|
|
) dt on pba.id = dt.account_id
|
|
|
left join (
|
|
|
select account_id, count(1) waterNumber,max(office_id) office_id from pay_base_customerandmeterrela
|
wangli