From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 52d3ba7..19056ee 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -4,7 +4,22 @@
<!--自定义分页查询-->
<select id="selectGridPage" resultType="org.springblade.modules.grid.vo.GridVO">
- select * from jczz_grid where is_deleted = 0
+ select
+ id,community_code,grid_name,principal,principal_phone,remark
+ from jczz_grid
+ where is_deleted = 0
+ <if test="grid.communityCode!=null and grid.communityCode!=''">
+ and community_code = #{grid.communityCode}
+ </if>
+ <if test="grid.gridName!=null and grid.gridName!=''">
+ and grid_name like concat('%',#{grid.gridName},'%')
+ </if>
+ <if test="grid.principal!=null and grid.principal!=''">
+ and principal like concat('%',#{grid.principal},'%')
+ </if>
+ <if test="grid.principalPhone!=null and grid.principalPhone!=''">
+ and principal_phone like concat('%',#{grid.principalPhone},'%')
+ </if>
</select>
<!--根据地址编号查询网格数据-->
@@ -21,9 +36,10 @@
<!--根据用户id(网格员)查询对应的房屋地址code-->
<select id="getAddressCodeListByUserId" resultType="java.lang.String">
select jgr.house_code from jczz_grid_range jgr
- left join jczz_grid jg on jg.id = jgr.grid_id
- where jg.is_deleted = 0
- and jg.user_id = #{userId}
+ left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join jczz_gridman jgm on jgm.grid_id = jg.id and jgm.is_deleted = 0
+ where 1=1
+ and jgm.user_id = #{userId}
</select>
<!--判断该小区点在哪个派出所-->
@@ -33,7 +49,7 @@
<!--根据地址编号查询网格数据-->
<select id="getGridDetailByParam" resultType="org.springblade.modules.grid.vo.GridVO">
- select jg.id,jg.grid_name,jg.community_name,
+ select jg.id,jg.grid_name,jg.community_name,sort,
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
@@ -44,4 +60,33 @@
limit 1
</select>
+ <!--自定义详情查询-->
+ <select id="getGridDetail" resultType="org.springblade.modules.grid.vo.GridVO">
+ select id,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
+ where is_deleted = 0 and id = #{grid.id}
+ </select>
+
+ <!--查询全部-->
+ <select id="selectGridAll" resultType="org.springblade.modules.grid.entity.GridEntity">
+ select id,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
+ where is_deleted = 0
+ </select>
+
+ <!--网格树-->
+ <select id="getGridTree" resultType="org.springblade.common.node.TreeStringNode">
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ union all
+ (
+ select
+ id,
+ community_code as parentId,
+ grid_name as name
+ from jczz_grid
+ where is_deleted = 0
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3