From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 102 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index d35b482..eaa6e46 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -2,6 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper">
+ <!--过滤网格数据-->
+ <sql id="filterHouseGrid">
+ <if test="houseParam.roleName!=null and houseParam.roleName!=''">
+ <if test="houseParam.roleName=='网格员'">
+ <choose>
+ <when test="list != null and list.size()>0">
+ and address_code in
+ <foreach collection="list" item="houseCode" separator ="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </when>
+ <otherwise>
+ and address_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </if>
+ </sql>
+
<!--门牌地址详情查询-->
<resultMap id="doorplateAddressDetailMap" type="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO"
autoMapping="true">
@@ -22,12 +41,18 @@
<!--查询区域数据-街道-->
<select id="getRegionListByGroupTwon" resultType="org.springblade.common.node.TreeNode" >
- select town_street_code as id,town_street_name as name from jczz_doorplate_address group by town_street_code,town_street_name
+ select town_street_code as id,town_street_name as name from jczz_doorplate_address
+ where 1=1
+ <include refid="filterHouseGrid"/>
+ group by town_street_code,town_street_name
</select>
<!--查询区域数据-社区-->
<select id="getRegionListByGroupNei" resultType="org.springblade.common.node.TreeNode" >
- select nei_code as id,nei_name as name from jczz_doorplate_address group by nei_code,nei_name
+ select nei_code as id,nei_name as name,town_street_code as parentId from jczz_doorplate_address
+ where 1=1
+ <include refid="filterHouseGrid"/>
+ group by nei_code,nei_name,town_street_code
</select>
<!--根据社区名称查询小区集合-->
@@ -36,12 +61,13 @@
where 1=1
and aoi_name !=''
and aoi_code !=''
- <if test="name != null and name!=''">
- and nei_name = #{name}
+ <if test="houseParam.name != null and houseParam.name!=''">
+ and nei_name = #{houseParam.name}
</if>
- <if test="code != null and code!=''">
- and nei_code = #{code}
+ <if test="houseParam.code != null and houseParam.code!=''">
+ and nei_code = #{houseParam.code}
</if>
+ <include refid="filterHouseGrid"/>
group by aoi_code,aoi_name
union all
(
@@ -49,12 +75,13 @@
where 1=1
and aoi_code !=''
and sub_aoi != ''
- <if test="name != null and name!=''">
- and nei_name = #{name}
+ <if test="houseParam.name != null and houseParam.name!=''">
+ and nei_name = #{houseParam.name}
</if>
- <if test="code != null and code!=''">
- and nei_code = #{code}
+ <if test="houseParam.code != null and houseParam.code!=''">
+ and nei_code = #{houseParam.code}
</if>
+ <include refid="filterHouseGrid"/>
group by aoi_code,sub_aoi
)
union all
@@ -62,12 +89,13 @@
select nei_code as id,'自建房/商铺' as name,2 as addressType from jczz_doorplate_address
where 1=1
and aoi_code is null
- <if test="name != null and name!=''">
- and nei_name = #{name}
+ <if test="houseParam.name != null and houseParam.name!=''">
+ and nei_name = #{houseParam.name}
</if>
- <if test="code != null and code!=''">
- and nei_code = #{code}
+ <if test="houseParam.code != null and houseParam.code!=''">
+ and nei_code = #{houseParam.code}
</if>
+ <include refid="filterHouseGrid"/>
group by nei_code
)
</select>
@@ -75,12 +103,12 @@
<!--根据小区名称查询楼栋/商铺集合-->
<select id="getBuildingList" resultType="org.springblade.common.node.TreeNode" >
(
- select building_code as id,building_name as name,1 as addressType from jczz_doorplate_address
+ select building_code as id,ifnull(building_name,'1栋') as name,1 as addressType from jczz_doorplate_address
where 1=1
- and aoi_code = #{code}
+ and aoi_code = #{houseParam.code}
and building_code !=''
- and building_name !=''
and doorplate_type = '户室牌'
+ <include refid="filterHouseGrid"/>
group by building_code,building_name
order by building_name
)
@@ -88,9 +116,10 @@
(
select address_code as id,doorplate_name as name,2 as addressType from jczz_doorplate_address
where 1=1
- and aoi_code = #{code}
+ and aoi_code = #{houseParam.code}
and building_name is null
and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+ <include refid="filterHouseGrid"/>
)
</select>
@@ -98,27 +127,30 @@
<select id="getUnitHouseholdList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode" >
(
select
- jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,jda.address_code addressCode,
+ ifnull(jda.unit_name,"未知单元") unitName,jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,
+ jda.address_code addressCode,
jh.name as realName,jh.role_type as roleType,1 as addressType
from jczz_doorplate_address jda
left join
- (select house_code,name,role_type from jczz_household where role_type = '业主') jh
+ (select house_code,name,role_type from jczz_household where role_type = 1) jh
on jda.address_code = jh.house_code
where 1=1
and floor != ''
and house_name != ''
and doorplate_type = '户室牌'
- and building_code = #{code}
+ and building_code = #{houseParam.code}
+ <include refid="filterHouseGrid"/>
)
union all
(
- select address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
+ select '' as unitName,address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
'' as realName,'' as roleType,2 as addressType
from jczz_doorplate_address
where 1=1
- and building_code = #{code}
+ and building_code = #{houseParam.code}
and building_name != ''
and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+ <include refid="filterHouseGrid"/>
)
</select>
@@ -170,22 +202,27 @@
select street_ru_code as id,street_ru_name as name,3 as addressType from jczz_doorplate_address
where 1=1
and aoi_code is null
- <if test="name != null and name!=''">
- and nei_name = #{name}
+ <if test="houseParam.name != null and houseParam.name!=''">
+ and nei_name = #{houseParam.name}
</if>
- <if test="code != null and code!=''">
- and nei_code = #{code}
+ <if test="houseParam.code != null and houseParam.code!=''">
+ and nei_code = #{houseParam.code}
</if>
+ <include refid="filterHouseGrid"/>
group by street_ru_code,street_ru_name
</select>
<!--根据街路巷编号查询街路巷门牌名称集合-->
<select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
- select address_code as addressCode,doorplate_name as floor from jczz_doorplate_address
+ select address_code as addressCode,
+ IFNULL(CONCAT(doorplate_num,sub_door_plate_no), IF(doorplate_num IS NULL, sub_door_plate_no, doorplate_num)) as floor
+ from jczz_doorplate_address
where 1=1
- and street_ru_code = #{code}
- and nei_code = #{name}
+ and street_ru_code = #{houseParam.code}
+ and nei_code = #{houseParam.name}
and aoi_code is null
+ <include refid="filterHouseGrid"/>
+ order by doorplate_num,sub_door_plate_no
</select>
<select id="getDoorplateAddressDetail"
@@ -218,4 +255,9 @@
</if>
</select>
+ <!--查询社区信息-->
+ <select id="getAllDoorplateAddress" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ select * from jczz_doorplate_address where nei_name = #{name}
+ </select>
+
</mapper>
--
Gitblit v1.9.3