From 7bbf08d2a38d91bf4a1cf278c52ff7303e05fdaf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 18:11:06 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 62fc194..fecf829 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -2,6 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper">
+ <!--门牌地址详情查询-->
+ <resultMap id="doorplateAddressDetailMap" type="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO"
+ autoMapping="true">
+ <id property="id" column="id"/>
+ <association property="place" javaType="org.springblade.modules.place.vo.PlaceVO"
+ autoMapping="true">
+ <id property="id" column="cid"/>
+ <result property="createTime" column="pcreateTime"/>
+ <result property="createUserName" column="createUserName"/>
+ </association>
+ </resultMap>
+
<!--自定义分页查询-->
<select id="selectDoorplateAddressPage" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
select * from jczz_doorplate_address where 1=1
@@ -15,7 +27,7 @@
<!--查询区域数据-社区-->
<select id="getRegionListByGroupNei" resultType="org.springblade.common.node.TreeNode" >
- select nei_code as id,nei_name as name from jczz_doorplate_address group by nei_code,nei_name
+ select nei_code as id,nei_name as name,town_street_code as parentId from jczz_doorplate_address group by nei_code,nei_name,town_street_code
</select>
<!--根据社区名称查询小区集合-->
@@ -63,11 +75,10 @@
<!--根据小区名称查询楼栋/商铺集合-->
<select id="getBuildingList" resultType="org.springblade.common.node.TreeNode" >
(
- select building_code as id,building_name as name,1 as addressType from jczz_doorplate_address
+ select building_code as id,ifnull(building_name,'1栋') as name,1 as addressType from jczz_doorplate_address
where 1=1
and aoi_code = #{code}
and building_code !=''
- and building_name !=''
and doorplate_type = '户室牌'
group by building_code,building_name
order by building_name
@@ -86,11 +97,12 @@
<select id="getUnitHouseholdList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode" >
(
select
- jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,jda.address_code addressCode,
+ 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
from jczz_doorplate_address jda
left join
- (select house_code,name,role_type from jczz_household where role_type = '业主') jh
+ (select house_code,name,role_type from jczz_household where role_type = 1) jh
on jda.address_code = jh.house_code
where 1=1
and floor != ''
@@ -100,7 +112,7 @@
)
union all
(
- select address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
+ 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
where 1=1
@@ -169,16 +181,25 @@
<!--根据街路巷编号查询街路巷门牌名称集合-->
<select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
- select address_code as addressCode,doorplate_name as floor from jczz_doorplate_address
+ select address_code as addressCode,
+ IFNULL(CONCAT(doorplate_num,sub_door_plate_no), IF(doorplate_num IS NULL, sub_door_plate_no, doorplate_num)) as floor
+ from jczz_doorplate_address
where 1=1
and street_ru_code = #{code}
and nei_code = #{name}
and aoi_code is null
+ order by doorplate_num,sub_door_plate_no
</select>
<select id="getDoorplateAddressDetail"
- resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
- SELECT * FROM jczz_doorplate_address
+ resultMap="doorplateAddressDetailMap">
+ SELECT
+ jda.*,
+ 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 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 != ''">
AND address_code = #{vo.stdId}
--
Gitblit v1.9.3