From 4ea0bdf2725618ed8a2d809c8183a452624f8395 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 14:18:56 +0800
Subject: [PATCH] 物业管理员只能查询移交给自己的报事报修

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 0396abc..8f1b8d4 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -85,6 +85,7 @@
         <collection property="householdLabelList" javaType="java.util.List"
                     ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
             <id property="id" column="cid"/>
+            <id property="houseCode" column="houseCodes"/>
             <result property="remark" column="cremark"/>
         </collection>
     </resultMap>
@@ -223,7 +224,15 @@
     <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
         select
             jh.*,
-            jhl.id as cid,jhl.*,jhl.remark as cremark
+            jhl.id as cid,
+            jhl.house_code houseCodes,
+            jhl.label_id,
+            jhl.label_name,
+            jhl.color,
+            jhl.user_id,
+            jhl.lable_type,
+            jhl.household_id,
+            jhl.remark as cremark
         from jczz_household jh
         left join jczz_user_house_label jhl on jh.id = jhl.household_id
         where 1=1 and jh.is_deleted = 0
@@ -233,11 +242,33 @@
     <!--查询房屋集合信息-按id-->
     <select id="getHouseholdListById" resultMap="householdAndLabelMap" >
         select
-            jh.*,
-            jhl.id as cid,jhl.*,jhl.remark as cremark
+            jh.id,jh.house_code,jh.name,jh.phone_number,jh.associated_user_id,
+            jh.role_type,jh.associated_user_name,jh.relationship,jh.is_primary_contact,
+            jh.residential_status,jh.gender,jh.birthday,jh.id_card,jh.hkmt_pass,jh.passport,
+            jh.ethnicity,jh.education,jh.resident_type,
+            jh.hukou_registration,jh.resident_adcode,jh.native_place_adcode,
+			jh.religious_belief,jh.health_status,jh.disease_name,
+            jh.work_status,jh.employer,jh.occupation,jh.cmpy_reg_addr,
+			jh.go_out_addr,jh.go_out_where,jh.go_out_time,jh.go_out_reason,
+            jh.marital_status,jh.card_number,jh.other_contact,
+            if(jda.id is not null,jda.address_name,jh.current_address) as current_address,
+            jh.disability_cert,jh.party_ember,jh.create_user,jh.create_time,jh.update_user,jh.update_time,jh.remark,jh.is_deleted,
+            jh.confirm_flag,jh.housing_rental_id,
+            jhs.source,
+            jhl.id as cid,
+            jhl.house_code houseCodes,
+            jhl.label_id,
+            jhl.label_name,
+            jhl.color,
+            jhl.user_id,
+            jhl.lable_type,
+            jhl.household_id,
+            jhl.remark as cremark
         from jczz_household jh
         left join jczz_user_house_label jhl on jh.id = jhl.household_id
-        where 1=1 and is_deleted = 0
+        left join jczz_doorplate_address jda on jda.address_code = jh.house_code
+        left join jczz_house jhs on jhs.house_code = jh.house_code
+        where 1=1 and jh.is_deleted = 0
         and jh.id = #{household.id}
     </select>
 

--
Gitblit v1.9.3