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/doorplateAddress/mapper/DoorplateAddressMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 c54eeb4..7118c6d 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -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!=''">
@@ -114,6 +114,9 @@
</if>
<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
)
@@ -378,4 +381,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