From 458eba2d12e1c45ffd019c4b624c6fbc6e843add Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 02 Jun 2023 11:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
index 2090d30..57aac7b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
@@ -6,14 +6,18 @@
<select id="selectAlarmRecordPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordVO">
select
sar.*,
- sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType
- from sm_alarm_record sar left join sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id and sar1.is_deleted = 0
+ sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,
+ arb."name" as reservoirName,aab."ad_name" as areaName
+ 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"
where sar.is_deleted = 0
<if test="alarmRecord.alarmSurveyStationName!=null and alarmRecord.alarmSurveyStationName!=''">
and alarm_survey_station_name like concat(concat('%',#{alarmRecord.alarmSurveyStationName}),'%')
</if>
<if test="alarmRecord.reservoirName!=null and alarmRecord.reservoirName!=''">
- and reservoir_name like concat(concat('%',#{alarmRecord.reservoirName}),'%')
+ and sar.reservoir_name like concat(concat('%',#{alarmRecord.reservoirName}),'%')
</if>
<if test="alarmRecord.type!=null and alarmRecord.type!=''">
and sar1.type = #{alarmRecord.type}
--
Gitblit v1.9.3