From d0b0e00e40226700a0ffa1f1671a8dc273610f67 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 18 Dec 2023 14:28:10 +0800
Subject: [PATCH] 菜单分类优化
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 88 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 23 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 19056ee..cfed231 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -28,9 +28,11 @@
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 blade_user bu on bu.id = jg.user_id and bu.is_deleted = 0
+ 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
where jg.is_deleted = 0
and jgr.house_code = #{houseCode}
+ limit 1
</select>
<!--根据用户id(网格员)查询对应的房屋地址code-->
@@ -49,15 +51,26 @@
<!--根据地址编号查询网格数据-->
<select id="getGridDetailByParam" resultType="org.springblade.modules.grid.vo.GridVO">
- 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
- left join jczz_place_rel jpr on locate(jpr.community_name,jg.community_name)>0 and locate(jpr.grid_name,jg.grid_name)>0 and jpr.is_deleted = 0
- left join blade_user bu on bu.id = jg.user_id and bu.is_deleted = 0
- where jg.is_deleted = 0
- and jpr.place_id = #{place.id}
- limit 1
+ 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_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
+ 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
+ AND bu.is_deleted = 0
+ WHERE
+ jg.is_deleted = 0
+ and jpr.place_id = #{place.id}
+ limit 1
</select>
<!--自定义详情查询-->
@@ -74,19 +87,48 @@
<!--网格树-->
<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'
+ 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 id,
+ community_code as parentId,
+ grid_name as name
+ from jczz_grid
+ where is_deleted = 0)
</select>
+ <select id="gridInfo" resultType="org.springblade.modules.grid.entity.GridmanEntity">
+ SELECT jg.id,
+ jg.grid_name,
+ jgm.pic_url,
+ jgm.mobile,
+ jgm.gridman_name
+ FROM jczz_grid jg
+ LEFT JOIN jczz_gridman jgm ON jgm.grid_id = jg.id
+ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE jgr.house_code = #{houseCode}
+ AND jg.is_deleted = '0'
+ AND jgm.is_deleted = '0'
+ </select>
+
+
+ <select id="gridAoiName"
+ resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ SELECT aoi_name,
+ GROUP_CONCAT(building_name) building_name
+ FROM (SELECT DISTINCT aoi_name,
+ building_name
+ FROM jczz_doorplate_address
+ WHERE address_code IN (SELECT jgr.house_code
+ FROM jczz_grid jg
+ LEFT JOIN jczz_gridman jgm ON jgm.grid_id = jg.id
+ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE jg.id = #{id})) a
+ GROUP BY aoi_name
+
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3