From 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Dec 2023 14:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 cfed231..cf356fd 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -130,5 +130,23 @@
 
     </select>
 
+    <!--网格集合查询-->
+    <select id="getGridList" resultType="org.springblade.modules.grid.entity.GridEntity">
+        SELECT * from jczz_grid
+        where is_deleted = 0
+        <if test="grid.communityCode!=null and grid.communityCode!=''">
+            and community_code = #{grid.communityCode}
+        </if>
+        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