From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据,不设置网格信息

---
 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index d859087..001bc19 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -44,16 +44,16 @@
     </select>
 
     <!--根据地址编号查询网格数据-->
-    <select id="getGridDetailByHouseCode" resultType="org.springblade.modules.grid.vo.GridVO">
+    <select id="getPlaceGridDetailByHouseCode" resultType="org.springblade.modules.grid.vo.GridVO">
         select jg.id,jg.grid_name,br.town_name AS townStreetName,br.name AS community_name,
         bu.real_name as realName,bu.phone as gridPhone
         from jczz_grid jg
-        left join jczz_grid_range jgr on jg.id = jgr.grid_id
-        left join jczz_gridman jgm on jg.id = jgm.grid_id and jgm.is_deleted = 0
+        left join jczz_place jp on jp.grid_code = jg.grid_code and jp.is_deleted = 0
+        left join jczz_gridman jgm on jg.grid_code = jgm.grid_code and jgm.is_deleted = 0
         left join blade_user bu on bu.id = jgm.user_id and bu.is_deleted = 0
         left join blade_region br ON br.code = jg.community_code
         where jg.is_deleted = 0
-        and jgr.house_code = #{houseCode}
+        and jp.house_code like concat('%',#{houseCode},'%')
         limit 1
     </select>
 
@@ -82,8 +82,7 @@
             bu.phone AS gridPhone
         FROM
             jczz_grid jg
-                LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
-                LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
+                LEFT JOIN jczz_gridman jgm on jg.grid_code = jgm.grid_code
                 LEFT JOIN blade_region br on br.code = jg.community_code
                 LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, br.name )> 0
                 AND locate( jpr.grid_name, jg.grid_name )> 0
@@ -114,7 +113,7 @@
                parent_code as parentId,
                name
         FROM blade_region
-        where district_code = '361102'
+        where district_code = '361102000000'
         union all
         (select id,
                 community_code as parentId,
@@ -172,4 +171,24 @@
         GROUP BY jg.grid_name
     </select>
 
+    <!--查询对应网格人对应的网格-->
+    <select id="getGridByUserId" resultType="org.springblade.modules.grid.entity.GridEntity">
+        select
+        jg.*
+        from jczz_grid jg
+        where jg.grid_code in
+        (
+        select * from (select grid_code from jczz_gridman  where is_deleted = 0 and user_id = #{userId} limit 1) a
+        )
+    </select>
+
+    <!--根据网格名称,社区名称查询对应的网格-->
+    <select id="getGridByNames" resultType="org.springblade.modules.grid.entity.GridEntity">
+        select jg.* from jczz_grid jg
+        left join blade_region br on br.village_code = jg.community_code
+        where jg.is_deleted = 0
+        and jg.grid_name = #{gridName}
+        and br.name = #{communityName}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3