From d76c9782a646eb0e1408e7b1b10e12dcec59943e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 17:42:17 +0800
Subject: [PATCH] 网格导入修改
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 8dc4af4..5907974 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -27,9 +27,11 @@
<select id="selectPropertyCompanyDistrictPage" resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
select
jpcd.*,
- jd.name as districtName
+ jd.name as districtName,
+ jpc.name as propertyCompanyName
from jczz_property_company_district jpcd
- left join jczz_district jd on jd.id = jpca.district_id and jd.is_deleted = 0
+ 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
where jpcd.is_deleted = 0
<if test="propertyCompanyDistrict.propertyCompanyId!=null">
and jpcd.property_company_id = #{propertyCompanyDistrict.propertyCompanyId}
@@ -46,6 +48,22 @@
<if test="propertyCompanyDistrict.districtName!=null and propertyCompanyDistrict.districtName!=''">
and jd.name like concat('%',#{propertyCompanyDistrict.districtName},'%')
</if>
+ <if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
+ and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
+ </if>
+ </select>
+
+ <select id="getDistictUserByCode" resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity">
+ SELECT
+ bu.*
+ 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_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}
</select>
--
Gitblit v1.9.3