|
|
@@ -441,14 +441,14 @@
|
|
|
r.account_id as "accountId"
|
|
|
,d.id as "meterId"
|
|
|
,d.water_meter_no as "eleno"
|
|
|
- ,ifnull(d.water_meter_no,d.metercode )as "metercode"
|
|
|
+ ,ifnull(d.water_meter_file_no,d.metercode )as "metercode"
|
|
|
,d.control_status as "valveState"
|
|
|
,cs.customer_no as "customerNo"
|
|
|
,sum(re.debt) debt
|
|
|
- ,r.remaining
|
|
|
+ ,max(r.remaining) remaining
|
|
|
from pay_pay_rechargeaccount r
|
|
|
left join pay_pay_receivable re on r.account_id = re.account_id and debt > 0
|
|
|
- left join sc_device d on d.id=r.meter_id
|
|
|
+ left join sc_device d on d.id=re.meter_id
|
|
|
left join sc_customer cs on cs.id=d.customer_id
|
|
|
where r.account_id in (
|
|
|
select account_id
|
|
|
@@ -458,7 +458,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
)
|
|
|
- group by cs.customer_no, r.account_id ,d.id ,d.water_meter_no ,d.water_meter_no,d.metercode ,d.control_status
|
|
|
+ group by cs.customer_no, r.account_id ,d.id ,d.water_meter_no ,d.water_meter_file_no,d.metercode ,d.control_status
|
|
|
|
|
|
</select>
|
|
|
|
wangli