From c59eeba06fa3ff353cd7c9016aa0a0b25a6931a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 18:16:06 +0800
Subject: [PATCH] 商超查询，房屋查询，场所查询修改
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 15 +++++++++++++--
1 files changed, 13 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 8f1b8d4..502c132 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -146,6 +146,7 @@
jh.create_time,
jh.update_user,
jh.update_time,
+ jh.confirm_flag,
jh.remark,
jhs.district_name aoiName,
concat( jhs.building, " ", unit, " ", room ) AS address,
@@ -237,6 +238,7 @@
left join jczz_user_house_label jhl on jh.id = jhl.household_id
where 1=1 and jh.is_deleted = 0
and jh.house_code = #{code}
+ order by jh.relationship asc,jh.id desc
</select>
<!--查询房屋集合信息-按id-->
@@ -244,7 +246,7 @@
select
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.residential_status,jh.gender,jh.birthday,jh.id_card,jh.card_type,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,
@@ -252,8 +254,15 @@
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.disability_cert,jh.party_ember,jh.remark,
jh.confirm_flag,jh.housing_rental_id,
+ if(jda.id is not null,substring(jda.town_street_code,1,9),jh.home_adcode) as home_adcode,
+ br1.name as residentAdName,
+ br1.province_code as residentProvinceAdCode,br1.province_name as residentProvinceAdName,
+ br1.city_code as residentCityAdCode,br1.city_name as residentCityAdName,
+ br2.name as nativePlaceAdName,
+ br2.province_code as nativePlaceProvinceAdCode,br2.province_name as nativePlaceProvinceAdName,
+ br2.city_code as nativePlaceCityAdCode,br2.city_name as nativePlaceCityAdName,
jhs.source,
jhl.id as cid,
jhl.house_code houseCodes,
@@ -268,6 +277,8 @@
left join jczz_user_house_label jhl on jh.id = jhl.household_id
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
+ left join blade_region br1 on br1.code = jh.resident_adcode
+ left join blade_region br2 on br2.code = jh.native_place_adcode
where 1=1 and jh.is_deleted = 0
and jh.id = #{household.id}
</select>
--
Gitblit v1.9.3