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