From ba38e73ef30424f4110fcee67a0d7627b08d931e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 09 Dec 2023 17:42:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 dab7adb..1aab548 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
@@ -44,6 +44,9 @@
<if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
and date_format(sar.create_time,'%Y-%m-%d') <= #{alarmRecord.endTime}
</if>
+ <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
+ and a."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
+ </if>
order by sar.id desc
</select>
@@ -120,6 +123,9 @@
<if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
and date_format(sar.create_time,'%Y-%m-%d') <= #{alarmRecord.endTime}
</if>
+ <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
+ and arb."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
+ </if>
) f
group by cityName,rule_name
</select>
@@ -137,6 +143,8 @@
select type,count(*) num
from YWXT.sm_alarm_record sar
left join YWXT.sm_alarm_rule e on e.id = sar.alarm_rule_id
+ left join SJZT_MD."att_res_base" a on a."guid" = sar.reservoir_number
+ left join SJZT_MD."att_ad_base" b on b."guid" = a."interior_ad_guid"
where sar.is_deleted = 0
<if test="alarmRecord.startTime!=null and alarmRecord.startTime!=''">
and date_format(sar.create_time,'%Y-%m-%d') >= #{alarmRecord.startTime}
@@ -144,6 +152,9 @@
<if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
and date_format(sar.create_time,'%Y-%m-%d') <= #{alarmRecord.endTime}
</if>
+ <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
+ and a."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
+ </if>
group by type
) b on a.dict_value = b.type
</select>
--
Gitblit v1.9.3