From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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..8db0ab6 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,
@@ -252,8 +253,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 +276,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