From 071d070683309b21019d6868e1c7cd38be680a35 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 31 Oct 2023 11:03:45 +0800
Subject: [PATCH] 预警返回测站名称
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
index 598011f..c74eedb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -44,16 +44,22 @@
</select>
<select id="getAlarmDetailPage" resultType="cn.gistack.nky.vo.AlarmGetVO">
SELECT
- ID,DAM_ID,POINT_ID,TYPE,
+ NAG.ID,
+ NAG.DAM_ID,
+ NAG.POINT_ID,
+ acb."cd_nm" as cdName,
+ NAG.TYPE,
(
CASE
- WHEN TYPE=1 THEN '渗压'
- WHEN TYPE=2 THEN '渗流'
- WHEN (TYPE=3 OR TYPE=4 OR TYPE=5) THEN '位移'
+ WHEN NAG.TYPE=1 THEN '渗压'
+ WHEN NAG.TYPE=2 THEN '渗流'
+ WHEN (NAG.TYPE=3 OR NAG.TYPE=4 OR NAG.TYPE=5) THEN '位移'
END) AS typeName,
- "TIME","VALUE","DESC",CREATE_TIME,TASK_CATEGORY,"LEVEL",BAOJINGZHI,ORIGIN_ID,FORWARD,"REVERSE",RATIO,STATUS
+ NAG."TIME",NAG."VALUE",NAG."DESC",NAG.CREATE_TIME,NAG.TASK_CATEGORY,NAG."LEVEL",NAG.BAOJINGZHI,NAG.ORIGIN_ID,
+ NAG.FORWARD,NAG."REVERSE",NAG.RATIO,NAG.STATUS
- FROM YWXT.NKY_ALARM_GET
+ FROM YWXT.NKY_ALARM_GET NAG
+ LEFT JOIN SJZT_MD."att_cd_base" acb ON acb."res_cd" = NAG.DAM_ID AND NAG.POINT_ID = acb."cd"
WHERE 1=1
<if test="vo.startTime != null and vo.startTime != ''">
AND DATE_FORMAT(time,'%Y-%m-%d') >= #{vo.startTime}
--
Gitblit v1.9.3