From e8455bcc0efa8909652adc0cf6a7dd7387f42617 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 27 Jan 2024 15:37:52 +0800
Subject: [PATCH] 新增场所检查，民警扫码查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 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 d3f36ee..cc565e7 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -469,29 +469,33 @@
</select>
<!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
- <select id="getPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
- select jda.* from jczz_doorplate_address jda join (
- select
- min(jda.id) as id
- from jczz_doorplate_address jda
- left join jczz_district jd on jda.aoi_code = jd.aoi_code
- where jda.aoi_code != "" and jda.aoi_name !="" and jd.id is null
- and (doorplate_type = '大门牌' or doorplate_type = '楼幢牌' or doorplate_type = '中门牌' or doorplate_type = '单元牌')
- GROUP BY jda.aoi_code
- union all
- (
- select
- min(jda.id) as id
- from jczz_doorplate_address jda
- left join jczz_district jd on jda.aoi_code = jd.aoi_code
- where jda.aoi_code != "" and jda.sub_aoi != ""
- and (doorplate_type = '大门牌' or doorplate_type = '楼幢牌' or doorplate_type = '中门牌')
- group by jda.aoi_code
- )
- ) a on jda.id = a.id
+ <select id="getNotInPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ select jda.* from jczz_doorplate_address jda
+ left join jczz_place jp on locate(jda.address_code,jp.house_code)>0 and jp.is_deleted = 0
+ where 1=1
+ and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+ and jp.id is null
+ and jda.poi != ''
+ <if test="doorplateAddress.townStreetName!=null and doorplateAddress.townStreetName!=''">
+ and jda.town_street_name like concat('%',#{doorplateAddress.townStreetName},'%')
+ </if>
</select>
- <!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
+ <!--查询场所标准地址数据-->
+ <select id="getPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ select jda.*
+ from jczz_doorplate_address jda
+ where 1=1
+ and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+ <if test="doorplateAddress.addressName!=null and doorplateAddress.addressName!=''">
+ and address_name like concat('%',#{doorplateAddress.addressName},'%')
+ </if>
+ <if test="doorplateAddress.poi!=null and doorplateAddress.poi!=''">
+ and poi like concat('%',#{doorplateAddress.poi},'%')
+ </if>
+ </select>
+
+ <!--查询地址表详情-->
<select id="getDoorplateAddressVODetail" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
select jda.* from jczz_doorplate_address jda where address_code = #{doorplateAddress.addressCode}
</select>
--
Gitblit v1.9.3