From 79fa17366c961ae0a84f975f2a6b6fa49b1f534c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 06 Mar 2024 14:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
index 1200ef9..373b9a0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
@@ -27,7 +27,39 @@
</select>
+ <select id="getMyCollectVO" resultType="cn.gistack.sm.collect.vo.CollectVO">
+ SELECT
+ SRUC.res_id,
+ arb."name" as resName,
+ arb."eng_scal" as engScal,
+ arb."res_reg_code" as resRegCode,
+ arb."res_type" as resType,
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
+
+ case when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
+ case when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
+
+ case when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS cityCode,
+ case 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 YWXT.SM_RES_USER_COLLECT SRUC
+
+ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = SRUC.RES_ID
+ LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = arb."interior_ad_guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
+ LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
+
+ WHERE SRUC.STATUS = 1 AND IS_DELETED = 0 AND USER_ID = #{userId}
+ </select>
</mapper>
--
Gitblit v1.9.3