From 66bdd41cebb851ad1ea80e315e349bef6d9087d4 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 21 Aug 2024 10:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E5=8C=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E5=AE=89=E7=BD=AE=E7=82=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9,=E6=B2=BF=E6=B2=B3=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E6=88=B7=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/xyt/mapper/IaCDanadMapper.java     | 8 ++++----
 .../com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java   | 4 ++--
 .../com/gunshi/project/xyt/mapper/ShpPlacementMapper.java | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
index 1e715d2..236969c 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
@@ -21,8 +21,8 @@ public interface IaCDanadMapper extends BaseMapper<IaCDanad> {
     @Select("""
             <script>
             SELECT st.*, r1.adnm||r2.adnm adnm FROM ia_c_danad st
-            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
-            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r2.adcd
+            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
+            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 12 ), '000' ) = r2.adcd
             </script>
             """)
     List<HomeIaCDanadVo> getDetailsAndMonitoringDataLis();
@@ -30,8 +30,8 @@ public interface IaCDanadMapper extends BaseMapper<IaCDanad> {
     @Select("""
             <script>
             SELECT st.*, r1.adnm||r2.adnm adnm FROM ia_c_danad st
-            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
-            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r2.adcd
+            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
+            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 12 ), '000' ) = r2.adcd
             WHERE st.dand = #{id}
             </script>
             """)
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
index ca7aa05..8ae16b3 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
@@ -20,8 +20,8 @@ public interface IaCFlrvvlgMapper extends BaseMapper<IaCFlrvvlg> {
     @Select("""
             <script>
             SELECT st.*,r1.adnm||r2.adnm adnm  FROM ia_c_flrvvlg st
-            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
-            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r2.adcd
+            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
+            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 12 ), '000' ) = r2.adcd
             WHERE st.adcd like '421181113%'
             </script>
             """)
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java
index 113e075..038c2e2 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java
@@ -19,8 +19,8 @@ public interface ShpPlacementMapper extends BaseMapper<ShpPlacement> {
     @Select("""
             <script>
             SELECT st.*,r1.adnm||r2.adnm adnm  FROM shp_placement st
-            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
-            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r2.adcd
+            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
+            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 12 ), '000' ) = r2.adcd
             </script>
             """)
     List<HomeShpPlacementVo> getDetailsAndMonitoringDataList();