From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 a584db6..41466b7 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -41,6 +41,7 @@
<if test="grid.townName != null and grid.townName !='' ">
and br.town_name like concat('%',#{grid.townName},'%')
</if>
+ order by community_code asc,grid_code asc
</select>
<!--根据地址编号查询网格数据-->
@@ -53,7 +54,7 @@
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 jp.house_code = #{houseCode}
+ and jp.house_code like concat('%',#{houseCode},'%')
limit 1
</select>
@@ -82,8 +83,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
@@ -104,7 +104,7 @@
<!--查询全部-->
<select id="selectGridAll" resultType="org.springblade.modules.grid.entity.GridEntity">
- select id,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
+ select id,grid_code,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
where is_deleted = 0
</select>
@@ -183,4 +183,13 @@
)
</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