From f5f5ee99007d12145ab7e7e3e2fe063f99e76732 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 12:26:05 +0800
Subject: [PATCH] 住户字段调整,详情查询修改

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 8f0918e..8f1b8d4 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -242,7 +242,19 @@
     <!--查询房屋集合信息-按id-->
     <select id="getHouseholdListById" resultMap="householdAndLabelMap" >
         select
-            jh.*,
+            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,
@@ -254,7 +266,9 @@
             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