|
|
@@ -556,19 +556,13 @@
|
|
|
scd.id as deviceId,
|
|
|
scinstall.is_accepted state,
|
|
|
(case scinstall.is_accepted WHEN 2 then '已开户' when 1 then '待开户' else '待验收' end) stateName,
|
|
|
- IFNULL(rd.reading,0) as CurrData
|
|
|
+ (select IFNULL(max(reading),0) from pay_amount_waterusedamount_day d where d.watermeter_id = scd.id)
|
|
|
from sc_device scd
|
|
|
left join sc_install_list scinstall on scd.id = scinstall.device_id and scinstall.customer_id=#{customerId}
|
|
|
left JOIN sc_device_type sdt on sdt.id = scd.device_type
|
|
|
left join sc_device_manufacturer sdm on sdm.id = sdt.manufacturer_id and sdm.`status`=1
|
|
|
left join pay_base_account pba on pba.id = scd.account_id and pba.site_id=#{siteId} and pba.customer_id=#{customerId}
|
|
|
left join pay_base_customerandmeterrela ppr on ppr.metercode = scd.metercode and ppr.site_id=#{siteId} and ppr.customer_id=#{customerId}
|
|
|
- left join
|
|
|
- (SELECT a.watermeter_id,a.reading FROM pay_amount_waterusedamount_day AS a,
|
|
|
- (SELECT b.watermeter_id, MAX(b.read_date) AS read_date FROM pay_amount_waterusedamount_day AS b
|
|
|
- where b.reading is not null and b.customer_id=#{customerId}
|
|
|
- GROUP BY b.watermeter_id)
|
|
|
- AS c WHERE a.watermeter_id=c.watermeter_id AND a.read_date = c.read_date) rd on rd.watermeter_id = scd.id
|
|
|
where scd.customer_id = #{customerId} and scd.account_id is not null
|
|
|
<if test="queryInfo != null and queryInfo != ''">
|
|
|
and (
|
Xiaojh