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/RescueTeamManageMapper.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml
index 96c3764..be58086 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml
@@ -4,13 +4,20 @@
<!--namespace根据自己需要创建的的mapper的路径和名称填写-->
<select id="selectMyPage" resultType="cn.gistack.sm.materials.vo.RescueTeamManageVO">
SELECT RM.*,
- 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
FROM SM_RESCUETEAM_MANAGE RM
- LEFT JOIN SJZT_MD."att_ad_base" aab1 ON aab1."guid" = RM.city
- LEFT JOIN SJZT_MD."att_ad_base" aab2 ON aab2."guid" = RM.county
- LEFT JOIN SJZT_MD."att_ad_base" aab3 ON aab3."guid" = RM.town
+ LEFT JOIN SJZT_MD."att_res_base" arb ON RM.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"
WHERE RM.IS_DELETED = 0
<if test="vo.resName !=null and vo.resName !=''">
AND RM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%')
--
Gitblit v1.9.3