From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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..1943370 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,14 +35,21 @@
<select id="selectMyPage" resultMap="vo">
SELECT MM.*,
- aab1."ad_name" cityName,
- aab2."ad_name" countyName,
- aab3."ad_name" townName,
+ arb."res_reg_code" as resRegCode,arb."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,
BDB.DICT_VALUE materialTypeName
FROM SM_MATERIALS_MANAGE MM
- LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = MM.city
- 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 SJZT_MD."att_res_base" arb ON MM.res_guid = arb."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" b ON arb."interior_ad_guid" = b."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"
LEFT JOIN BLADE_DICT_BIZ BDB ON MM.MATERIALS_TYPE = BDB.DICT_KEY
WHERE MM.IS_DELETED = 0 AND BDB.CODE='MATERIALS_TYPE'
<if test="vo.resName !=null and vo.resName !=''">
--
Gitblit v1.9.3