From 17c81b57ec33fc692ed1499cda86bb01f1fe65a0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 16:52:27 +0800
Subject: [PATCH] 房屋数据导出字典翻译修改
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 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 1a77b02..cb71fb9 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -150,42 +150,32 @@
and jh.id = #{household.id}
</select>
+ <!--导出数据-->
<select id="export" resultType="org.springblade.modules.house.excel.HouseHoldExcel">
- <include refid="selectHousehold"/>
- <where>
- <if test="id != null "> and id = #{id}</if>
- <if test="houseCode != null and houseCode != ''"> and house_code = #{houseCode}</if>
- <if test="name != null and name != ''"> and name = #{name}</if>
- <if test="phoneNumber != null and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
- <if test="associatedUserId != null "> and associated_user_id = #{associatedUserId}</if>
- <if test="roleType != null "> and role_type = #{roleType}</if>
- <if test="associatedUserName != null and associatedUserName != ''"> and associated_user_name = #{associatedUserName}</if>
- <if test="relationship != null "> and relationship = #{relationship}</if>
- <if test="isPrimaryContact != null "> and is_primary_contact = #{isPrimaryContact}</if>
- <if test="residentialStatus != null "> and residential_status = #{residentialStatus}</if>
- <if test="gender != null "> and gender = #{gender}</if>
- <if test="birthday != null "> and birthday = #{birthday}</if>
- <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
- <if test="hkmtPass != null and hkmtPass != ''"> and hkmt_pass = #{hkmtPass}</if>
- <if test="passport != null and passport != ''"> and passport = #{passport}</if>
- <if test="ethnicity != null "> and ethnicity = #{ethnicity}</if>
- <if test="education != null "> and education = #{education}</if>
- <if test="hukouRegistration != null and hukouRegistration != ''"> and hukou_registration = #{hukouRegistration}</if>
- <if test="workStatus != null "> and work_status = #{workStatus}</if>
- <if test="employer != null and employer != ''"> and employer = #{employer}</if>
- <if test="maritalStatus != null "> and marital_status = #{maritalStatus}</if>
- <if test="cardNumber != null and cardNumber != ''"> and card_number = #{cardNumber}</if>
- <if test="otherContact != null and otherContact != ''"> and other_contact = #{otherContact}</if>
- <if test="currentAddress != null and currentAddress != ''"> and current_address = #{currentAddress}</if>
- <if test="disabilityCert != null and disabilityCert != ''"> and disability_cert = #{disabilityCert}</if>
- <if test="partyEmber != null "> and party_ember = #{partyEmber}</if>
- <if test="createUser != null "> and create_user = #{createUser}</if>
- <if test="createTime != null "> and create_time = #{createTime}</if>
- <if test="updateUser != null "> and update_user = #{updateUser}</if>
- <if test="updateTime != null "> and update_time = #{updateTime}</if>
- <if test="remark != null and remark != ''"> and remark = #{remark}</if>
- <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
- </where>
+ select
+ jh.name,jh.phone_number phoneNumber,jh.role_type roleType,jh.relationship relationship,
+ jh.is_primary_contact isPrimaryContact,jh.residential_status residentialStatus,jh.gender,
+ jh.birthday,jh.id_card idCard,jh.hkmt_pass hkmtPass,jh.passport,jh.ethnicity,jh.education,
+ jh.hukou_registration hukouRegistration,jh.work_status workStatus,jh.employer,jh.marital_status maritalStatus,
+ jh.card_number cardNumber,jh.other_contact otherContact,jh.current_address currentAddress,
+ jh.disability_cert disabilityCert,jh.party_ember partyEmber,jh.remark,
+ jhs.district_name aoiName,
+ concat(jhs.building," ",unit," ",room) as address
+ from
+ jczz_household jh join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
+ where jh.is_deleted = 0
+ <if test="household.name!=null and household.name !=''">
+ and jh.name like concat('%',#{household.name},'%')
+ </if>
+ <if test="household.phoneNumber!=null and household.phoneNumber !=''">
+ and jh.phone_number like concat('%',#{household.phoneNumber},'%')
+ </if>
+ <if test="household.idCard!=null and household.idCard !=''">
+ and jh.id_card like concat('%',#{household.idCard},'%')
+ </if>
+ <if test="household.aoiName!=null and household.aoiName !=''">
+ and jhs.district_name like concat('%',#{household.aoiName},'%')
+ </if>
</select>
--
Gitblit v1.9.3