From 3f3b0379cca52d13b377fae4c4d15b15aa18b1a7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Apr 2024 15:45:06 +0800
Subject: [PATCH] 字典接口逻辑修改,告警表格返回告警等级

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
index c3bdbce..7996dec 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
@@ -15,7 +15,8 @@
             END AS countyName,
         case when b."ad_grad" = 2 THEN b."ad_name"
             when c."ad_grad" = 2 THEN c."ad_name"
-            ELSE d."ad_name" END AS cityName
+            ELSE d."ad_name" END AS cityName,
+            sar1.alarm_level
         from YWXT.sm_alarm_record sar
         left join YWXT.sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id and sar1.is_deleted = 0
         left join SJZT_MD."att_res_base" a on a."guid" = sar.reservoir_number
@@ -50,6 +51,9 @@
         <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
             and  a."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
         </if>
+        <if test="alarmRecord.alarmLevel != null and alarmRecord.alarmLevel !=''">
+            and sar1.alarm_level = #{alarmRecord.alarmLevel}
+        </if>
         order by sar.id desc
     </select>
 

--
Gitblit v1.9.3