From b7643654cc7ed5bbc6958f590fdadb7f7cf587e6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 25 Nov 2023 11:23:11 +0800
Subject: [PATCH] 物业小区关联调整
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
index 665ace0..4322bbf 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
@@ -8,9 +8,9 @@
<result column="name" property="name"/>
<result column="address" property="address"/>
<result column="social_credit_code" property="socialCreditCode"/>
- <result column="province_code" property="provinceCode"/>
- <result column="city_code" property="cityCode"/>
- <result column="county_code" property="countyCode"/>
+ <result column="province" property="province"/>
+ <result column="city" property="city"/>
+ <result column="area" property="area"/>
<result column="remark" property="remark"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
@@ -20,7 +20,7 @@
</resultMap>
<!--自定义分页查询-->
- <select id="selectPropertyCompanyPage" resultMap="propertyCompanyResultMap">
+ <select id="selectPropertyCompanyPage" resultType="org.springblade.modules.property.vo.PropertyCompanyVO">
select * from jczz_property_company where is_deleted = 0
<if test="propertyCompany.name!=null and propertyCompany.name!=''">
and name like concat('%',#{propertyCompany.name},'%')
@@ -28,12 +28,23 @@
</select>
<!--物业公司列表查询（不分页）-->
- <select id="getPropertyCompanyList" resultMap="propertyCompanyResultMap">
+ <select id="getPropertyCompanyList" resultType="org.springblade.modules.property.vo.PropertyCompanyVO">
select * from jczz_property_company where is_deleted = 0
<if test="propertyCompany.name!=null and propertyCompany.name!=''">
and name like concat('%',#{propertyCompany.name},'%')
</if>
</select>
+ <!--物业公司列表查询（不分页）-->
+ <select id="getUserByPropertyCompany" resultType="java.util.Map">
+ select
+ bu.id,bu.real_name as name
+ from blade_user bu
+ left join blade_dept bd on bd.id = bu.dept_id and bd.is_deleted = 0
+ left join jczz_property_company jpc on jpc.dept_id = bd.id and jpc.is_deleted = 0
+ where bu.is_deleted = 0 and bu.real_name is not null
+ and jpc.id = #{propertyCompany.id}
+ </select>
+
</mapper>
--
Gitblit v1.9.3