From eb1464e4dd3aca6289b42f060ce5360de921fc97 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 23 Sep 2023 16:23:18 +0800
Subject: [PATCH] 智能外呼导出，告警内容查询导出修改（加水库基本信息）
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 2b4e4d0..4469202 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
@@ -7,14 +7,24 @@
select
sar.*,
sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,sar1.rule_name as ruleName,
- arb."name" as reservoirName,aab."ad_name" as areaName
+ a."name" as reservoirName,a."res_reg_code" as resRegCode,a."eng_scal" as engScal,
+ case when b."ad_grad" = 4 THEN b."ad_name"
+ ELSE NULL END AS townName,
+ case when b."ad_grad" = 3 THEN b."ad_name"
+ when c."ad_grad" = 3 THEN C."ad_name"
+ 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
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" arb on arb."guid" = sar.reservoir_number
- left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
+ 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"
+ LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid"
where sar.is_deleted = 0
<if test="alarmRecord.reservoirName!=null and alarmRecord.reservoirName!=''">
- and arb."name" like concat('%',#{alarmRecord.reservoirName},'%')
+ and a."name" like concat('%',#{alarmRecord.reservoirName},'%')
</if>
<if test="alarmRecord.type!=null and alarmRecord.type!=''">
and sar1.type = #{alarmRecord.type}
@@ -28,6 +38,12 @@
<if test="alarmRecord.ruleName!=null and alarmRecord.ruleName!=''">
and sar1.rule_name = #{alarmRecord.ruleName}
</if>
+ <if test="alarmRecord.startTime!=null and alarmRecord.startTime!=''">
+ and date_format(sar.create_time,'%Y-%m-%d') >= #{alarmRecord.startTime}
+ </if>
+ <if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
+ and date_format(sar.create_time,'%Y-%m-%d') <= #{alarmRecord.endTime}
+ </if>
order by sar.id desc
</select>
--
Gitblit v1.9.3