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-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
index b6f374d..3b643a0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
@@ -10,6 +10,8 @@
         <result property="cityName" column="cityName"/>
         <result property="county" column="county"/>
         <result property="countyName" column="countyName"/>
+        <result property="engScal" column="engScal"/>
+        <result property="resRegCode" column="resRegCode"/>
         <result property="town" column="town"/>
         <result property="townName" column="townName"/>
         <result property="materialsType" column="MATERIALS_TYPE"/>
@@ -33,6 +35,7 @@
 
     <select id="selectMyPage" resultMap="vo">
         SELECT MM.*,
+            arb."res_reg_code" as resRegCode,arb."eng_scal" as engScal,
             aab1."ad_name" cityName,
             aab2."ad_name" countyName,
             aab3."ad_name" townName,
@@ -42,6 +45,7 @@
         LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = MM.county
         LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = MM.town
         LEFT JOIN BLADE_DICT_BIZ BDB ON MM.MATERIALS_TYPE = BDB.DICT_KEY
+        LEFT JOIN SJZT_MD."att_res_base" arb ON MM.res_guid = arb."guid"
         WHERE MM.IS_DELETED = 0 AND BDB.CODE='MATERIALS_TYPE'
         <if test="vo.resName !=null and vo.resName !=''">
             AND MM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%')

--
Gitblit v1.9.3