|
@@ -252,7 +252,7 @@
|
|
|
|
|
|
SELECT
|
|
|
c.id,c.office_id,
|
|
|
- ifnull(lastwua.reading, IFNULL(d.new_meter_start,0)),
|
|
|
+ ROUND(ifnull(lastwua.reading, IFNULL(d.new_meter_start,0)),2),
|
|
|
ifnull(lastwua.recorddate,d.date_create),c.metercode,
|
|
|
c.watermeter_id,#{month},null,null,null,NULL,1,
|
|
|
c.waterproperty_id,#{year},c.account_id,c.accountname,c.accountnumber,c.address,
|
|
@@ -338,7 +338,7 @@
|
|
|
) SELECT
|
|
|
c.id,
|
|
|
c.office_id,
|
|
|
- ifnull( lastwua.reading, ifnull(device.new_meter_start,0) ),
|
|
|
+ ROUND(ifnull( lastwua.reading, ifnull(device.new_meter_start,0) ),2),
|
|
|
ifnull( lastwua.recorddate, c.create_date ),
|
|
|
c.metercode,
|
|
|
c.watermeter_id,
|