From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 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 b010522..9328afa 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -40,7 +40,7 @@
<!--查询区域数据-街道-->
- <select id="getRegionListByGroupTwon" resultType="org.springblade.common.node.TreeNode" >
+ <select id="getRegionListByGroupTwon" resultType="org.springblade.common.node.TreeStringNode" >
select town_street_code as id,town_street_name as name from jczz_doorplate_address
where 1=1
<if test="houseParam.userId!=null and houseParam.userId!='' and houseParam.userId=='1726859808689696770'">
@@ -51,7 +51,7 @@
</select>
<!--查询区域数据-社区-->
- <select id="getRegionListByGroupNei" resultType="org.springblade.common.node.TreeNode" >
+ <select id="getRegionListByGroupNei" resultType="org.springblade.common.node.TreeStringNode" >
select nei_code as id,nei_name as name,town_street_code as parentId from jczz_doorplate_address
where 1=1
<if test="houseParam.userId!=null and houseParam.userId!='' and houseParam.userId=='1726859808689696770'">
@@ -62,7 +62,7 @@
</select>
<!--根据社区名称查询小区集合-->
- <select id="getDistrictList" resultType="org.springblade.common.node.TreeNode" >
+ <select id="getDistrictList" resultType="org.springblade.common.node.TreeStringNode" >
select aoi_code as id,aoi_name as name,1 as addressType from jczz_doorplate_address
where 1=1
and aoi_name !=''
@@ -106,7 +106,7 @@
)
union all
(
- select '商超' as id,'商超' as name,4 as addressType from jczz_place_rel jpl
+ select '企业商超' as id,'企业商超' as name,4 as addressType from jczz_place_rel jpl
join jczz_place jp on jpl.place_id = jp.id and jp.is_deleted = 0
where jpl.is_deleted = 0
<if test="houseParam.communityName!=null and houseParam.communityName!=''">
@@ -115,12 +115,15 @@
<if test="houseParam.gridName!=null and houseParam.gridName!=''">
and grid_name like concat('%',#{houseParam.gridName},'%')
</if>
+ <if test="houseParam.code != null and houseParam.code!=''">
+ and community_code = #{houseParam.code}
+ </if>
limit 1
)
</select>
<!--根据小区名称查询楼栋/商铺集合-->
- <select id="getBuildingList" resultType="org.springblade.common.node.TreeNode" >
+ <select id="getBuildingList" resultType="org.springblade.common.node.TreeStringNode" >
(
select building_code as id,ifnull(building_name,'1栋') as name,1 as addressType from jczz_doorplate_address
where 1=1
@@ -217,7 +220,7 @@
</select>
<!--根据社区查询街路巷集合-->
- <select id="getStreetRuList" resultType="org.springblade.common.node.TreeNode" >
+ <select id="getStreetRuList" resultType="org.springblade.common.node.TreeStringNode" >
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
@@ -241,6 +244,7 @@
and street_ru_code = #{houseParam.code}
and nei_code = #{houseParam.name}
and aoi_code is null
+ and doorplate_type = '中门牌'
<include refid="filterHouseGrid"/>
order by doorplate_num,sub_door_plate_no
</select>
@@ -277,7 +281,11 @@
<!--查询社区信息-->
<select id="getAllDoorplateAddress" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
- select * from jczz_doorplate_address where nei_name = #{name}
+ select * from jczz_doorplate_address
+ where 1=1
+ <if test="name!=null and name!=''">
+ and nei_name = #{name}
+ </if>
</select>
<!--获取房屋树-->
@@ -346,7 +354,7 @@
</select>
<!--查询商超-->
- <select id="getPlaceRelList" resultType="org.springblade.common.node.TreeNode">
+ <select id="getPlaceRelList" resultType="org.springblade.common.node.TreeStringNode">
select building_name as id,building_name as name,4 as addressType from jczz_place_rel jpl
join jczz_place jp on jpl.place_id = jp.id and jp.is_deleted = 0
where jpl.is_deleted = 0
@@ -378,4 +386,55 @@
</if>
</select>
+ <!--查询小区集合-->
+ <select id="getAoiList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ select nei_code,aoi_code,ifnull(aoi_name,sub_aoi) as aoi_name,x,y,address_name from jczz_doorplate_address
+ where 1=1
+ <choose>
+ <when test="list != null and list.size()>0">
+ and id in
+ <foreach collection="list" item="id" separator ="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and id in ('')
+ </otherwise>
+ </choose>
+ </select>
+
+ <!--查询所有的地址表id集合-->
+ <select id="getAoiCodeList" resultType="java.lang.Long">
+ select
+ max(id)
+ from jczz_doorplate_address
+ where aoi_code != "" and aoi_name !=""
+ GROUP BY aoi_code
+ union all
+ (
+ select
+ max(id)
+ from jczz_doorplate_address
+ where aoi_code != "" and sub_aoi != ""
+ group by aoi_code
+ )
+ </select>
+
+ <!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
+ <select id="getPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ select jda.* from jczz_doorplate_address jda
+ left join jczz_place jp on jp.house_code = jda.address_code and jp.is_deleted =0
+ where 1=1
+ and jp.house_code is null
+ and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+ union all
+ (
+ select jda.* from jczz_doorplate_address jda
+ left join jczz_place jp on jp.house_code = jda.address_code and jp.is_deleted =0
+ where 1=1
+ and jp.house_code is null
+ and aoi_code is null
+ and doorplate_type='中门牌'
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3