From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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..84d4e34 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -263,7 +263,8 @@
jda.id,ifnull(jda.unit_name,"未知单元") unitName,jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,
jda.address_code addressCode,
jh.name as realName,jh.relationship as roleType,1 as addressType,
- juhl.id as cid,juhl.house_code,juhl.label_id,juhl.label_name,juhl.color,juhl.household_id
+ juhl.id as cid,juhl.house_code,juhl.label_id,juhl.label_name,juhl.color,juhl.household_id,
+ juhlh.color as houseColor
from jczz_doorplate_address jda
left join
(
@@ -272,7 +273,8 @@
)
) jh
on jda.address_code = jh.house_code
- left join jczz_user_house_label juhl on juhl.house_code = jda.address_code and lable_type=1
+ left join jczz_user_house_label juhl on juhl.house_code = jda.address_code and juhl.lable_type=1
+ left join jczz_user_house_label juhlh on juhlh.house_code = jda.address_code and juhlh.lable_type=2
where 1=1
and floor != ''
and house_name != ''
@@ -287,9 +289,11 @@
(
select jda2.id,'' as unitName,address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
'' as realName,'' as roleType,2 as addressType,
- juhl.id as cid,juhl.house_code,juhl.label_id,juhl.label_name,juhl.color,juhl.household_id
+ juhl.id as cid,juhl.house_code,juhl.label_id,juhl.label_name,juhl.color,juhl.household_id,
+ juhlh.color as houseColor
from jczz_doorplate_address jda2
- left join jczz_user_house_label juhl on juhl.house_code = jda2.address_code and lable_type=1
+ left join jczz_user_house_label juhl on juhl.house_code = jda2.address_code and juhl.lable_type=1
+ left join jczz_user_house_label juhlh on juhlh.house_code = jda2.address_code and juhlh.lable_type=2
where 1=1
and building_code = #{houseParam.code}
and building_name != ''
@@ -484,6 +488,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 +544,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 +686,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