From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 1eebc43..ec411a2 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -484,6 +484,10 @@
where 1=1
and jh.house_code is null
and doorplate_type = '户室牌'
+ <if test="townName!=null and townName!=''">
+ and jda.town_street_name like concat('%',#{townName},'%')
+ </if>
+ limit 0,1000
</select>
<!--查询商超-->
@@ -536,16 +540,18 @@
<!--查询所有的地址表id集合-->
<select id="getAoiCodeList" resultType="java.lang.Long">
select
- max(id)
+ min(id)
from jczz_doorplate_address
where aoi_code != "" and aoi_name !=""
+ and doorplate_type = '大门牌'
GROUP BY aoi_code
union all
(
select
- max(id)
+ min(id)
from jczz_doorplate_address
where aoi_code != "" and sub_aoi != ""
+ and doorplate_type = '大门牌'
group by aoi_code
)
</select>
@@ -676,4 +682,18 @@
and jda.building_code is not null
</select>
+
+
+ <!--查询所有户室数据-->
+ <select id="getNotHouseListCount" resultType="java.lang.Integer">
+ select count(*) from jczz_doorplate_address jda
+ left join jczz_house jh on jh.house_code = jda.address_code
+ where 1=1
+ and jh.house_code is null
+ and doorplate_type = '户室牌'
+ <if test="townName!=null and townName!=''">
+ and jda.town_street_name like concat('%',#{townName},'%')
+ </if>
+ limit 0,1000
+ </select>
</mapper>
--
Gitblit v1.9.3