From 24bbe7a75c85816524c097caacb141cc6846acb9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 11 十二月 2024 15:21:21 +0800 Subject: [PATCH] 增加删除取水口水量月统计年统计重复数据功能,增加删除农户用水量月统计年统计重复数据功能, --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml index 6b07701..b9aba1b 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml @@ -552,7 +552,8 @@ <if test="onLineMap != null and onLineMap !='' and isOnLine != null"> rtus.isOnLine, </if> - alarm.alarm + alarm.alarm, + alarm.alarmDt FROM pr_intake inta INNER JOIN pr_controller con ON con.intakeId = inta.id LEFT JOIN rm_on_hour_report_last hou ON hou.intake_id = inta.id @@ -563,7 +564,8 @@ IF(alarm_battery_volt = 1, '鐢垫睜鐢靛帇鎶ヨ锛�', ''), IF(alarm_valve = 1, '闃�闂ㄦ姤璀︼紝', ''), IF(alarm_water_meter_fault = 1, '娴侀噺璁℃晠闅滄姤璀︼紝', '') - ) AS alarm + ) AS alarm, + dt AS alarmDt FROM rm_alarm_state_last WHERE (alarm_loss = 1 OR alarm_battery_volt = 1 OR alarm_valve = 1 OR alarm_water_meter_fault = 1) AND dt >= DATE_SUB(NOW(), INTERVAL 12 HOUR) -- Gitblit v1.8.0