From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 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 aaa8961..c10d128 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -5,31 +5,43 @@
     <!--自定义分页查询-->
     <select id="selectGridPage" resultType="org.springblade.modules.grid.vo.GridVO">
         select
-        id,community_code,grid_name,principal,principal_phone,remark
-        from jczz_grid
-        where is_deleted = 0
+        jg.id,jg.community_code,jg.grid_name,jg.principal,jg.principal_phone,jg.remark,
+        br.name as communityName,br.town_name as townName
+        from jczz_grid jg
+        left join blade_region br on br.code = jg.community_code
+        where jg.is_deleted = 0
         <if test="grid.communityCode!=null and grid.communityCode!=''">
-            and community_code = #{grid.communityCode}
+            and jg.community_code = #{grid.communityCode}
         </if>
         <if test="grid.gridName!=null and grid.gridName!=''">
-            and grid_name like concat('%',#{grid.gridName},'%')
+            and jg.grid_name like concat('%',#{grid.gridName},'%')
         </if>
         <if test="grid.principal!=null and grid.principal!=''">
-            and principal like concat('%',#{grid.principal},'%')
+            and jg.principal like concat('%',#{grid.principal},'%')
         </if>
         <if test="grid.principalPhone!=null and grid.principalPhone!=''">
-            and principal_phone like concat('%',#{grid.principalPhone},'%')
+            and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
+        </if>
+        <if test="grid.regionCode != null and grid.regionCode !='' ">
+            and jg.community_code like concat('%',#{grid.regionCode},'%')
+        </if>
+        <if test="grid.communityName != null and grid.communityName !='' ">
+            and br.name like concat('%',#{grid.communityName},'%')
+        </if>
+        <if test="grid.townName != null and grid.townName !='' ">
+            and br.town_name like concat('%',#{grid.townName},'%')
         </if>
     </select>
 
     <!--根据地址编号查询网格数据-->
     <select id="getGridDetailByHouseCode" resultType="org.springblade.modules.grid.vo.GridVO">
-        select jg.id,jg.grid_name,jg.community_name,
+        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 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}
         limit 1
@@ -54,15 +66,16 @@
         SELECT
             jg.id,
             jg.grid_name,
-            jg.community_name,
-            sort,
+            br.name as community_name,
+            jg.sort,
             bu.real_name AS realName,
             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_place_rel jpr ON locate( jpr.community_name, jg.community_name )> 0
+                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
                 AND jpr.is_deleted = 0
                 LEFT JOIN blade_user bu ON bu.id = jgm.user_id
@@ -140,4 +153,13 @@
         order by sort asc
     </select>
 
+    <!--查询小区网格绑定-->
+    <select id="getGridListByAoiCode" resultType="org.springblade.modules.grid.vo.GridVO">
+        SELECT jg.grid_name from jczz_grid jg
+        left join jczz_grid_range jgr on jg.id = jgr.grid_id
+        where jg.is_deleted = 0
+        and jgr.district_code = #{aoiCode}
+        GROUP BY jg.grid_name
+    </select>
+
 </mapper>

--
Gitblit v1.9.3