From 016e47ea961d84a186db0bbd45cd6d7eaaa57bc3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jan 2024 16:30:20 +0800
Subject: [PATCH] 文章添加小区id 字段
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 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 6341475..d3f36ee 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -111,6 +111,7 @@
select aoi_code as id,sub_aoi as name,1 as addressType from jczz_doorplate_address
where 1=1
and aoi_code !=''
+ and aoi_name is null
and sub_aoi != ''
<if test="houseParam.name != null and houseParam.name!=''">
and nei_name = #{houseParam.name}
@@ -145,9 +146,6 @@
<if test="houseParam.communityName!=null and houseParam.communityName!=''">
and community_name like concat('%',#{houseParam.communityName},'%')
</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>
@@ -178,17 +176,32 @@
)
</select>
+ <!--户室map-->
+ <resultMap id="houseFuncNodeMap" type="org.springblade.modules.doorplateAddress.vo.FuncNode" autoMapping="true" >
+ <id column="id" property="id"/>
+ <collection property="householdLabelList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
+ <id property="id" column="cid"/>
+ </collection>
+ </resultMap>
+
<!--查询户室及住户相关信息，单元中包含住户-->
- <select id="getUnitHouseholdList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode" >
+ <select id="getUnitHouseholdList" resultMap="houseFuncNodeMap" >
(
select
- ifnull(jda.unit_name,"未知单元") unitName,jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,
+ 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.role_type as roleType,1 as addressType
+ 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
from jczz_doorplate_address jda
left join
- (select house_code,name,role_type from jczz_household where role_type = 1) jh
+ (
+ SELECT house_code, NAME, relationship FROM jczz_household WHERE id in(
+ SELECT max(id) FROM jczz_household where is_deleted =0 and relationship = 1 GROUP BY house_code
+ )
+ ) 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
where 1=1
and floor != ''
and house_name != ''
@@ -201,9 +214,11 @@
)
union all
(
- select '' as unitName,address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
- '' as realName,'' as roleType,2 as addressType
- from jczz_doorplate_address
+ 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
+ from jczz_doorplate_address jda2
+ left join jczz_user_house_label juhl on juhl.house_code = jda2.address_code and lable_type=1
where 1=1
and building_code = #{houseParam.code}
and building_name != ''
@@ -292,7 +307,7 @@
jp.id as cid,jp.*,jp.create_time as pcreateTime,
bu.real_name as createUserName
FROM jczz_doorplate_address jda
- left join jczz_place jp on jda.address_code = jp.house_code and jp.is_deleted = 0
+ left join jczz_place jp on locate(jda.address_code,jp.house_code)>0 and jp.is_deleted = 0
left join blade_user bu on bu.id = jp.create_user and bu.is_deleted = 0
WHERE 1=1
<if test="vo.stdId != null and vo.stdId != ''">
@@ -397,25 +412,22 @@
<if test="houseParam.communityName!=null and houseParam.communityName!=''">
and community_name like concat('%',#{houseParam.communityName},'%')
</if>
- <if test="houseParam.gridName!=null and houseParam.gridName!=''">
- and grid_name like concat('%',#{houseParam.gridName},'%')
- </if>
group by building_name
</select>
<!--查询商超详情集合-->
<select id="getPlaceRelDetailList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
select jp.id as addressCode,
+ jpl.grid_name as unitName,
+ jpl.community_code as unitCode,
doorplate_num as floor,
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
+ and doorplate_num!=''
<if test="houseParam.communityName!=null and houseParam.communityName!=''">
and community_name like concat('%',#{houseParam.communityName},'%')
- </if>
- <if test="houseParam.gridName!=null and houseParam.gridName!=''">
- and grid_name like concat('%',#{houseParam.gridName},'%')
</if>
<if test="houseParam.buildingName!=null and houseParam.buildingName!=''">
and building_name = #{houseParam.buildingName}
--
Gitblit v1.9.3