From 9368af055814be24d7f1220437dc3f4490f915ae Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 25 Jul 2024 11:07:56 +0800
Subject: [PATCH] 渗压资料告警重复问题并过滤没有测站的水库

---
 skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml
index fe1dc44..13cebc7 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml
@@ -49,7 +49,8 @@
                      basic.cityName           city_nm,
                      LISTAGG(basic.type, ',') WITHIN GROUP (ORDER BY basic.type ASC) typeList
               from (
-                  SELECT
+                  select
+
                   distinct
                   arb."guid", arb."name",
                   stra.type,
@@ -69,7 +70,13 @@
                   when town."ad_grad" = 2 THEN town."ad_name"
                   when county."ad_grad" = 2 THEN county."ad_name"
                   ELSE city."ad_name" END AS cityName
-                  FROM SJZT_MD."att_res_base" arb
+
+                  from (
+                  select arb.* from (
+                  select distinct "res_cd" from sjzt_md."att_cd_base" where "cd_type" = 'sy' and "res_cd" is not null
+                  ) a
+                  left join  SJZT_MD."att_res_base" arb on (a."res_cd" = arb."guid")
+                  ) arb
                   LEFT JOIN SJZT_MD."att_ad_base" town ON town."ad_code" = arb."interior_ad_guid"
                   LEFT JOIN SJZT_MD."att_ad_base" county ON county."ad_code" = town."p_ad_code"
                   LEFT JOIN SJZT_MD."att_ad_base" city ON city."ad_code" = county."p_ad_code"
@@ -79,7 +86,7 @@
                   basic.townCode, basic.townName,
                   basic.countyCode, basic.countyName,
                   basic.cityCode, basic.cityName) info
-        where info.typeList != '2,3,8,11,12' or info.typeList is null
+        where info.typeList != '2,3,8,11,12' or info.typeList is null order by info.res_cd
     </select>
     <select id="getWyLackAlertList" resultMap="vo">
         select

--
Gitblit v1.9.3