diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml index 78f45e7..d3eca33 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml @@ -112,9 +112,9 @@ FROM ter_device_info di INNER JOIN - ter_device_monitoring_data dm ON di.sn = dm.sn + ter_monitoring_warn_record dm ON di.sn = dm.sn WHERE - di.sn = #{sn} AND dm.idencolle = 1 AND DATE(dm.date) BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP} + di.sn = #{sn} AND dm.yesnoant = 1 AND DATE(dm.date) BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP} GROUP BY di.sn, di.first_warn_datetime