diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index 472a1a9..e7e29d5 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -155,7 +155,7 @@ namespace FrontendWebApi.ApiControllers ( select device_number from {table} - where start_timestamp >= '{startTime}' and end_timestamp < '{endTime}' and point = 'KWH' {buildingSql} + where start_timestamp >= '{startTime}' and start_timestamp < '{endTime}' and point = 'KWH' {buildingSql} {sqlWhere} group by device_number ) dn @@ -164,7 +164,7 @@ namespace FrontendWebApi.ApiControllers left join ( select device_number, {sqlAvgRawData} from {table} - where start_timestamp >= '{startTime}' and end_timestamp < '{endTime}' and point = 'KWH' {buildingSql} + where start_timestamp >= '{startTime}' and start_timestamp < '{endTime}' and point = 'KWH' {buildingSql} {sqlWhere} {sqlGroup} ) aemm on {date_yyyymmdd} and aemm.device_number = fd.device_number join device dc on fd.device_number = dc.device_number