bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -89,14 +89,40 @@
        </collection>
    </resultMap>

    <resultMap id="householdPageAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
        <id property="id" column="id"/>
        <collection property="householdLabelList" javaType="java.util.List" select="selectHouseLabelPage"  column="id"
                    ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
        </collection>
    </resultMap>

    <select id="selectHouseLabelPage" resultType="org.springblade.modules.house.vo.HouseholdLabelVO">
        select
        id,
        house_code,
        label_id,
        label_name,
        color,
        remark cremark,
        user_id,
        lable_type,
        household_id
        from
        jczz_user_house_label
        where household_id = #{id} and lable_type = 1
    </select>

    <!--自定义分页数据查询-->
    <select id="selectHouseholdPage" resultType="org.springblade.modules.house.vo.HouseholdVO">
    <select id="selectHouseholdPage" resultMap="householdPageAndLabelMap">
        select
        jh.*,
        jhs.district_name aoiName,
        concat(jhs.building," ",unit," ",room) as address
        concat(jhs.building," ",unit," ",room) as address,
        jda.town_street_name as townStreetName,jda.nei_name as neiName
        from
        jczz_household jh join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
        jczz_household jh
        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
        where jh.is_deleted = 0
        <if test="household.name!=null and household.name !=''">
            and jh.name like concat('%',#{household.name},'%')
@@ -116,6 +142,15 @@
        <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>
    </select>

    <!--查询房屋集合信息-->
@@ -126,7 +161,9 @@
               false            as hasChildren,
               jda.doorplate_type  doorplateType,
               jda.address_level   addressLevel,
               jda.nei_name   neiName
               jda.nei_name        neiName,
               jda.aoi_code        aoiCode,
               jh.relationship     relationship
        from jczz_household jh
                 left join jczz_doorplate_address jda on jh.house_code = jda.address_code
        where 1 = 1
@@ -211,6 +248,7 @@
        LEFT JOIN jczz_property_company_district jpcd on jpcd.district_id=jd.id
        WHERE 1=1
        AND jda.address_code = #{household.houseCode}
        limit 1
    </select>

    <!--查询网格-->
@@ -237,39 +275,45 @@


    <select id="getHouseHoldStatistics" resultType="java.util.Map">

        SELECT
        a.gender,
        count( a.gender ) numbers
        FROM
        ( SELECT
        IF
        (
        SELECT
        CASE

        WHEN
        jh.gender = 1 THEN
        '男'
        WHEN jh.gender = 0 THEN
        '女' ELSE '未知'
        END AS gender
        id_card IS NULL or id_card = '',
        '未知',
        IF
        (SUBSTRING( id_card, 17, 1 ) % 2 = 1, '男', '女' )) AS gender
        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
        <if test="userId != null">
            AND EXISTS (
            SELECT
            *
        and jda.doorplate_type = '户室牌'
        <if test="userId != null and roleType == '1'">
            AND jda.address_code IN (
            SELECT DISTINCT
            jgr.house_code
            FROM
            jczz_grid jg
            LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
            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>
        <if test="userId != null and roleType == '3'">
            AND jda.address_code IN (SELECT
            jda.address_code
            FROM
            jczz_doorplate_address jda
            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
            WHERE
            jc.res_police_user_id = #{userId})
            )
        </if>
        ) a
@@ -283,35 +327,45 @@
                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
        GROUP BY
                age
        <if test="userId != null">
            AND EXISTS (
        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
            *
            distinct jgr.house_code
            FROM
            jczz_grid jg
            LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
            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>
        ORDER BY
            age

        <if test="userId != null and roleType == '3'">
            AND jda.address_code IN (SELECT
            jda.address_code
            FROM
            jczz_doorplate_address jda
            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
            WHERE
            jc.res_police_user_id = #{userId})
            )
        </if>
        GROUP BY age
    </select>