From dfc3caadc68ac140a515f23be6de02ebac53878e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 17:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 205 insertions(+), 25 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 873fc47..19ac1cf 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -557,32 +557,212 @@
</select>
<!--导出数据-->
- <select id="export" resultType="org.springblade.modules.house.excel.ImportHouseholdExcel">
- select
- jh.house_code houseCode,
- 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.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.volunteer_org,
- jh.disability_cert disabilityCert,jh.party_ember partyEmber,jh.remark,
+ <select id="export" resultType="org.springblade.modules.house.excel.ExportHouseholdExcel">
+ SELECT
+ jh.id,
+ jh.house_code,
+ jh.NAME,
+ jh.phone_number,
+ jh.relationship,
+ jh.is_primary_contact,
+ jh.residential_status,
+ jh.birthday,
+ jh.id_card,
+ jh.card_type,
+ ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
+ 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.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>
+ jda.town_street_name AS townName,
+ jda.nei_name AS communityName,
+ jg.grid_name,
+ jhs.building,
+ jh.volunteer_org,
+ case
+ when TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) < 18 then 2
+ when TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) >= 18 then 1
+ end as minors,
+ jhs.unit,
+ juhl.label_name
+ FROM
+ jczz_household jh
+ LEFT JOIN jczz_house jhs ON jh.house_code = jhs.house_code and jhs.is_deleted = 0
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
+ LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+ LEFT JOIN (
+ select household_id,GROUP_CONCAT(label_name) as label_name from jczz_user_house_label where lable_type = 1 and household_id is not null GROUP BY household_id
+ ) juhl on juhl.household_id = jh.id
+ <where>
+ <if test="household.labelIdList !=null and household.labelIdList.size() >0 ">
+ EXISTS (
+ SELECT
+ *
+ FROM
+ jczz_user_house_label juhl
+ LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+ where juhl.household_id = jh.id
+ and juhl.lable_type = 1
+ AND juhl.household_id IS NOT NULL
+ AND jl.id in
+ <foreach collection="household.labelIdList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </if>
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
+ </if>
+
+ <if test="household.searchKey!=null and household.searchKey!=''">
+ and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
+ </if>
+
+ <if test="household.name!=null and household.name !=''">
+ and jh.name like concat('%',#{household.name},'%')
+ </if>
+ <if test="household.volunteerOrg != null and household.volunteerOrg != ''">
+ and jh.volunteer_org like concat('%',#{household.volunteerOrg},'%')
+ </if>
+ <if test="household.houseCode!=null and household.houseCode !=''">
+ and jh.house_code = #{household.houseCode}
+ </if>
+
+ <if test="household.communityCode!=null and household.communityCode !=''">
+ and jg.community_code = #{household.communityCode}
+ </if>
+ <!-- 等于18 就是租户 -->
+ <if test="household.relationship!=null and household.relationship == 18">
+ and jh.relationship = #{household.relationship}
+
+ <if test="household.minors!=null and household.minors ==2">
+ and TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) < 18
+ </if>
+ <if test="household.minors!=null and household.minors ==1">
+ and TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) >= 18
+ </if>
+ </if>
+ <!-- 不等于18 就是非租户 -->
+ <if test="household.relationship!=null and household.relationship != 18">
+ and jh.relationship != #{household.relationship}
+ </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>
+ <if test="household.confirmFlag != null ">
+ and jh.confirm_flag = #{household.confirmFlag}
+ </if>
+ <if test="household.townStreetName!=null and household.townStreetName!=''">
+ and jda.town_street_name like concat('%',#{household.townStreetName},'%')
+ </if>
+ <if test="household.neiName!=null and household.neiName!=''">
+ and jda.nei_name like concat('%',#{household.neiName},'%')
+ </if>
+ <if test="household.housingRentalId != null ">
+ and jh.housing_rental_id = #{household.housingRentalId}
+ </if>
+ <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
+ AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="household.roleName != null and household.roleName != ''">
+ <if test="household.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jhs.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jhs.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="household.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
+ </if>
+ <if test="household.building!=null and household.building!=''">
+ and jhs.building like concat(#{household.building},'%')
+ </if>
+ <if test="household.unit!=null and household.unit!=''">
+ and jhs.unit like concat(#{household.unit},'%')
+ </if>
+ <if test="household.aoiCode!=null and household.aoiCode!=''">
+ and jhs.district_code = #{household.aoiCode}
+ </if>
+ and jh.is_deleted = 0
+ </where>
+ order by jh.create_time desc
+ limit 0,10000
</select>
--
Gitblit v1.9.3