|
@@ -245,8 +245,8 @@
|
|
|
else '' end) as "ladderlevelname",
|
|
|
re.payamount,
|
|
|
re.waterbasicprice,
|
|
|
- sum(case when payway != 4 then reced.receivedamount else 0 end ) receivedamount,
|
|
|
- sum(case when payway = 4 then reced.receivedamount else 0 end ) autoReceivedamount
|
|
|
+ sum(case when payway != 5 then reced.receivedamount else 0 end ) receivedamount,
|
|
|
+ sum(case when payway = 5 then reced.receivedamount else 0 end ) autoReceivedamount
|
|
|
from pay_amount_waterusedamount a
|
|
|
left join pay_pay_receivable re on a.id=re.usedamount_id
|
|
|
left join pay_pay_received reced on reced.receivable_id=re.id
|
|
@@ -260,8 +260,8 @@
|
|
|
'' as "ladderlevelname",
|
|
|
sum(re.payamount) as "payamount",
|
|
|
max(re.waterbasicprice) as "waterbasicprice",
|
|
|
- sum(case when payway != 4 then reced.receivedamount else 0 end ) receivedamount,
|
|
|
- sum(case when payway = 4 then reced.receivedamount else 0 end ) autoReceivedamount
|
|
|
+ sum(case when payway != 5 then reced.receivedamount else 0 end ) receivedamount,
|
|
|
+ sum(case when payway = 5 then reced.receivedamount else 0 end ) autoReceivedamount
|
|
|
from pay_amount_waterusedamount a
|
|
|
left join pay_pay_receivable re on a.id=re.usedamount_id
|
|
|
left join pay_pay_received reced on reced.receivable_id=re.id
|