场所标签优化

linwe

2023-12-25 b738548b942265ec7fc487bdd2017d7d91da26f1

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -115,7 +115,13 @@
    <!--自定义分页数据查询-->
    <select id="selectHouseholdPage" resultMap="householdPageAndLabelMap">
        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.birthday,jh.id_card,jh.hkmt_pass,jh.passport,
        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.hukou_registration,jh.work_status,employer,
        jh.marital_status,jh.card_number,jh.other_contact,jh.current_address,jh.disability_cert,
        jh.party_ember,jh.create_user,jh.create_time,jh.update_user,jh.update_time,jh.remark,
        jhs.district_name aoiName,
        concat(jhs.building," ",unit," ",room) as address,
        jda.town_street_name as townStreetName,jda.nei_name as neiName
@@ -292,9 +298,10 @@
        WHERE
        jda.nei_code = #{code}
        AND jh.is_deleted = 0
        and jda.doorplate_type = '户室牌'
        <if test="userId != null and roleType == '1'">
            AND jda.address_code IN (
            SELECT
            SELECT DISTINCT
            jgr.house_code
            FROM
            jczz_grid jg
@@ -302,7 +309,6 @@
            LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
            WHERE
            jgm.user_id = #{userId}
            AND jh.house_code = jgr.house_code
            AND jg.is_deleted = 0
            )
        </if>
@@ -327,17 +333,20 @@
                when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 0  and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ <= ]]> 3   then '0~3岁'
                when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 4 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())   <![CDATA[ <= ]]> 17  then '4~17岁'
                when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 18 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ <= ]]> 39  then '18~39岁'
                when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 40 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ <= ]]> 59  then '40~59岁'
                when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 60 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ <= ]]> 79  then '60~79岁'
                when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上'
                ELSE '无身份信息'
                END AS age,
            count(1) as number FROM
            jczz_household jh
                LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
        when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 40 and
        TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ <= ]]> 59 then '40~59岁'
        when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ >= ]]> 60 and
        TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate())  <![CDATA[ <= ]]> 79 then '60~79岁'
        when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上'
        ELSE '无身份信息'
        END AS age,
        count(1) as number FROM
        jczz_household jh
        LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
        WHERE
            jda.nei_code =  #{code}
          AND jh.is_deleted = 0
        jda.nei_code = #{code}
        and jda.doorplate_type = '户室牌'
        AND jh.is_deleted = 0
        <if test="userId != null and roleType == '1'">
            AND jda.address_code IN (
            SELECT