|
@@ -353,14 +353,14 @@
|
|
|
NULL
|
|
|
FROM
|
|
|
pay_base_customerandmeterrela c
|
|
|
+ LEFT JOIN sc_install_list sil ON sil.device_id = c.watermeter_id
|
|
|
LEFT JOIN pay_amount_waterusedamount_day amount ON amount.watermeter_id = c.watermeter_id
|
|
|
AND amount.read_date = DATE_FORMAT( DATE_SUB( now(), INTERVAL 1 DAY ), '%Y%m%d' )
|
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
|
oldwua.watermeter_id,
|
|
|
oldwua.reading,
|
|
|
- oldwua.recorddate,
|
|
|
- sil.new_meter_start
|
|
|
+ oldwua.recorddate
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
@@ -374,7 +374,6 @@
|
|
|
waterusedamount.watermeter_id
|
|
|
) lastid
|
|
|
LEFT JOIN pay_amount_waterusedamount oldwua ON lastid.create_date = oldwua.create_date
|
|
|
- LEFT JOIN sc_install_list sil on sil.device_id = oldwua.watermeter_id
|
|
|
AND oldwua.watermeter_id = lastid.watermeter_id
|
|
|
) lastwua ON c.watermeter_id = lastwua.watermeter_id
|
|
|
WHERE
|