From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 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 cc565e7..31c77b0 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -332,10 +332,21 @@
<!--查询社区信息-->
<select id="getAllDoorplateAddress" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
- select * from jczz_doorplate_address
- where 1=1
- <if test="name!=null and name!=''">
- and nei_name = #{name}
+ select
+ jda.id,
+ jda.address_code,
+ jda.aoi_code,
+ jda.aoi_name,
+ jda.x,
+ jda.y
+ from jczz_doorplate_address jda
+ left join jczz_grid_range jgr on jda.address_code = jgr.house_code
+ where 1=1 and jgr.id is null
+ <if test="doorplateAddressEntity.neiName!=null and doorplateAddressEntity.neiName!=''">
+ and jda.nei_name = #{doorplateAddressEntity.neiName}
+ </if>
+ <if test="doorplateAddressEntity.townStreetName!=null and doorplateAddressEntity.townStreetName!=''">
+ and jda.town_street_name = #{doorplateAddressEntity.townStreetName}
</if>
</select>
@@ -471,13 +482,12 @@
<!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
<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
+ left join jczz_place jp on jda.address_code=jp.house_code 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 test="townName!=null and townName!=''">
+ and jda.town_street_name like concat('%',#{townName},'%')
</if>
</select>
--
Gitblit v1.9.3