From 9e991688f78d9795d8c32def22112f552aec994d Mon Sep 17 00:00:00 2001 From: jiahao Date: Fri, 3 Nov 2023 14:46:21 +0800 Subject: [PATCH] =?UTF-8?q?debug=20-=20=E6=97=A5=E5=A0=B1=E8=A1=A8?= =?UTF-8?q?=E6=AF=8F=E6=9C=88=E6=9C=80=E5=BE=8C=E4=B8=80=E5=A4=A9=20?= =?UTF-8?q?=E6=B2=92=E6=9C=89=E7=B8=BD=E8=A8=88=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/HydroMeterController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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