From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 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 bdb121a..0ee126f 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -30,19 +30,44 @@
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,
+ br.name communityName,
+ br.name streetName,
+ jg.grid_name,
+ bu.name principalName
+ 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 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
+ LEFT JOIN blade_user bu on bu.id = jpcd.principal
where jpcd.is_deleted = 0
+ <if test="propertyCompanyDistrict.communityName!=null and propertyCompanyDistrict.communityName!=''">
+ and br.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>
<if test="propertyCompanyDistrict.propertyStage!=null">
and jpcd.property_stage = #{propertyCompanyDistrict.propertyStage}
+ </if>
+ <if test="propertyCompanyDistrict.deptId!=null and propertyCompanyDistrict.deptId != ''">
+ and jpc.dept_id = #{propertyCompanyDistrict.deptId}
</if>
<if test="propertyCompanyDistrict.principal!=null and propertyCompanyDistrict.principal!=''">
and jpcd.principal like concat('%',#{propertyCompanyDistrict.principal},'%')
@@ -53,7 +78,7 @@
<if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
</if>
- <if test="propertyCompanyDistrict.districtIds">
+ <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}
@@ -62,18 +87,16 @@
</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 bu.*,
+ jpc.name distictName
+ FROM blade_user bu
+ LEFT JOIN jczz_property_district_user jpdu ON bu.id = jpdu.user_id and bu.is_deleted = 0
+ 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