From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
index fdcc0c4..d1ed391 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="org.springblade.modules.property.mapper.PropertyCompanyDistrictMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="propertyCompanyDistrictResultMap" type="org.springblade.modules.property.entity.PropertyCompanyDistrictEntity">
+ <resultMap id="propertyCompanyDistrictResultMap"
+ type="org.springblade.modules.property.entity.PropertyCompanyDistrictEntity">
<result column="id" property="id"/>
<result column="property_company_id" property="propertyCompanyId"/>
<result column="district_id" property="districtId"/>
@@ -24,18 +25,40 @@
</resultMap>
<!--自定义分页查询-->
- <select id="selectPropertyCompanyDistrictPage" resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
+ <select id="selectPropertyCompanyDistrictPage"
+ resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
select
jpcd.*,
jd.name as districtName,
- jpc.name as propertyCompanyName
- from jczz_property_company_district jpcd
- left join jczz_district jd on jd.id = jpcd.district_id and jd.is_deleted = 0
- left join jczz_property_company jpc on jpc.id = jpcd.property_company_id and jpc.is_deleted = 0
+ jpc.name as propertyCompanyName,
+ jc.name communityName,
+ br.name streetName,
+ jg.grid_name
+ FROM
+ jczz_property_company_district jpcd
+ LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id AND jd.is_deleted = 0
+ LEFT JOIN jczz_property_company jpc ON jpc.id = jpcd.property_company_id AND jpc.is_deleted = 0
+ LEFT JOIN jczz_community jc on jc.`code`=jd.community_code
+ LEFT JOIN blade_region br on br.code= jd.community_code
+ LEFT JOIN jczz_grid_range jgr on jgr.district_code=jd.id
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
where jpcd.is_deleted = 0
+ <if test="propertyCompanyDistrict.communityName!=null and propertyCompanyDistrict.communityName!=''">
+ and jc.name like concat('%', #{propertyCompanyDistrict.communityName},'%')
+ </if>
+
+ <if test="propertyCompanyDistrict.streetName!=null and propertyCompanyDistrict.streetName!=''">
+ and br.name like concat('%', #{propertyCompanyDistrict.streetName},'%')
+ </if>
+
+ <if test="propertyCompanyDistrict.gridName!=null and propertyCompanyDistrict.gridName!=''">
+ and jg.grid_name like concat('%', #{propertyCompanyDistrict.gridName},'%')
+ </if>
+
<if test="propertyCompanyDistrict.propertyCompanyId!=null">
and jpcd.property_company_id = #{propertyCompanyDistrict.propertyCompanyId}
</if>
+
<if test="propertyCompanyDistrict.districtId!=null">
and jpcd.district_id = #{propertyCompanyDistrict.districtId}
</if>
@@ -51,6 +74,27 @@
<if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
</if>
+ <if test="propertyCompanyDistrict.districtIds != null and propertyCompanyDistrict.districtIds.size()>0">
+ and jpcd.district_id in
+ <foreach collection="propertyCompanyDistrict.districtIds" item="id" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ </select>
+
+ <select id="getDistictUserByCode" resultType="org.springblade.modules.system.vo.UserVO">
+ SELECT
+ bu.*,
+ jpc.name distictName
+ FROM
+ blade_user bu
+ LEFT JOIN jczz_property_district_user jpdu ON bu.id = jpdu.user_id
+ LEFT JOIN jczz_property_company_district jpcd ON jpdu.property_company_district_id = jpcd.id
+ LEFT JOIN jczz_property_company jpc on jpc.id = jpcd.property_company_id
+ LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id
+ LEFT JOIN jczz_doorplate_address jda ON jda.aoi_code = jd.aoi_code
+ WHERE
+ jda.address_code = #{houseCode} and bu.is_deleted = 0
</select>
--
Gitblit v1.9.3