From 097709d403df7715075e877b750d588e37d038b5 Mon Sep 17 00:00:00 2001 From: mashili Date: Sat, 27 Sep 2025 20:01:31 +0800 Subject: [PATCH] =?UTF-8?q?0918=E4=BC=98=E5=8C=96-=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E8=BF=90=E8=A1=8CPCS=E6=9C=80=E9=AB=98=E6=B8=A9=E5=BA=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ems/EmsPcsDataMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index 560f619..791fab4 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -585,7 +585,9 @@ latest.dateHour as createDate from ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%Y-%m-%d %H:00:00') AS dateHour,MAX(p.data_update_time) as max_update_time FROM ems_pcs_data p - + WHERE p.site_id = #{siteId} + AND p.data_update_time >= Date(#{startDate}) + AND p.data_update_time <= #{endDate} GROUP BY p.site_id, p.device_id,dateHour ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id AND latest.device_id = t.device_id @@ -605,7 +607,9 @@ latest.dateHour as createDate from ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%Y-%m-%d %H:00:00') AS dateHour,MAX(p.data_update_time) as max_update_time FROM ems_pcs_data p - + WHERE p.site_id = #{siteId} + AND p.data_update_time >= Date(#{startDate}) + AND p.data_update_time <= #{endDate} GROUP BY p.site_id, p.device_id,dateHour ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id AND latest.device_id = t.device_id