Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -39,38 +39,37 @@
    </resultMap>

    <sql id="selectHousehold">
        select
            id,
            house_code,
            name,
            phone_number,
            associated_user_id,
            role_type,
            relationship,
            is_primary_contact,
            residential_status,
            gender,
            birthday,
            id_card,
            ethnicity,
            education,
            hukou_registration,
            work_status,
            employer,
            marital_status,
            card_number,
            other_contact,
            current_address,
            disability_cert,
            party_ember,
            create_user,
            create_time,
            update_user,
            update_time,
            remark,
            is_deleted,
            confirm_flag,
            housing_rental_id
        select id,
               house_code,
               name,
               phone_number,
               associated_user_id,
               role_type,
               relationship,
               is_primary_contact,
               residential_status,
               gender,
               birthday,
               id_card,
               ethnicity,
               education,
               hukou_registration,
               work_status,
               employer,
               marital_status,
               card_number,
               other_contact,
               current_address,
               disability_cert,
               party_ember,
               create_user,
               create_time,
               update_user,
               update_time,
               remark,
               is_deleted,
               confirm_flag,
               housing_rental_id
        from jczz_household
    </sql>

@@ -92,19 +91,18 @@
    </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 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>

    <!--自定义分页数据查询-->
@@ -166,6 +164,7 @@
        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
        <where>
            <if test="household.userId!=null">
                AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
@@ -204,17 +203,71 @@
            </if>
            <if test="isAdministrator==2">
                <choose>
                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                        and jg.community_code in
                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
                    <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>
                        and jg.community_code in ('')
                        <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="isAdministrator==2">-->
<!--                <choose>-->
<!--                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">-->
<!--                        and jg.community_code in-->
<!--                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">-->
<!--                            #{code}-->
<!--                        </foreach>-->
<!--                    </when>-->
<!--                    <otherwise>-->
<!--                        and jg.community_code in ('')-->
<!--                    </otherwise>-->
<!--                </choose>-->
<!--            </if>-->
            <if test="household.building!=null and household.building!=''">
                and jhs.building like concat(#{household.building},'%')
            </if>
@@ -331,72 +384,104 @@
               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 and jh.is_deleted = 0
        and jh.associated_user_id = #{userId}
                 left join jczz_doorplate_address jda on jh.house_code = jda.address_code
        where 1 = 1
          and jh.is_deleted = 0
          and jh.associated_user_id = #{userId}
    </select>

    <!--查询房屋集合信息-->
    <select id="getHouseholdListByCode" resultMap="householdAndLabelMap">
        select
            jh.*,
            jhl.id as cid,
            jhl.house_code houseCodes,
            jhl.label_id,
            jhl.label_name,
            jhl.color,
            jhl.user_id,
            jhl.lable_type,
            jhl.household_id,
            jhl.remark as cremark
        select jh.*,
               jhl.id     as  cid,
               jhl.house_code houseCodes,
               jhl.label_id,
               jhl.label_name,
               jhl.color,
               jhl.user_id,
               jhl.lable_type,
               jhl.household_id,
               jhl.remark as  cremark
        from jczz_household jh
        left join jczz_user_house_label jhl on jh.id = jhl.household_id
        where 1=1 and jh.is_deleted = 0
        and jh.house_code = #{code}
        order by -jh.relationship desc,jh.id desc
                 left join jczz_user_house_label jhl on jh.id = jhl.household_id
        where 1 = 1
          and jh.is_deleted = 0
          and jh.house_code = #{code}
        order by -jh.relationship desc, jh.id desc
    </select>

    <!--查询房屋集合信息-按id-->
    <select id="getHouseholdListById" resultMap="householdAndLabelMap">
        select
            jh.id,jh.house_code,jh.name,jh.phone_number,jh.associated_user_id,
            jh.role_type,jh.relationship,jh.is_primary_contact,
            jh.residential_status,jh.gender,jh.birthday,jh.id_card,
            jh.card_type,jh.card_no,
            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,
            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,
            jhl.label_id,
            jhl.label_name,
            jhl.color,
            jhl.user_id,
            jhl.lable_type,
            jhl.household_id,
            jhl.remark as cremark
        select jh.id,
               jh.house_code,
               jh.name,
               jh.phone_number,
               jh.associated_user_id,
               jh.role_type,
               jh.relationship,
               jh.is_primary_contact,
               jh.residential_status,
               jh.gender,
               jh.birthday,
               jh.id_card,
               jh.card_type,
               jh.card_no,
               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,
               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,
               jhl.label_id,
               jhl.label_name,
               jhl.color,
               jhl.user_id,
               jhl.lable_type,
               jhl.household_id,
               jhl.remark                                                                    as cremark
        from jczz_household jh
        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}
                 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>

    <!--导出数据-->
@@ -431,44 +516,89 @@

    <select id="statistics" resultType="java.lang.Integer">
        SELECT
        count( 1 )
        count(1)
        FROM
        jczz_household jh
        LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
        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
        <where>
            <if test="neiCode != null and neiCode != ''">
                and jda.nei_code = #{neiCode}
            <if test="household.neiCode != null and household.neiCode != ''">
                and jda.nei_code = #{household.neiCode}
            </if>
            <if test="userId != null">
                AND jh.house_code IN (
                SELECT
                jgr.house_code
                FROM
                jczz_grid_range jgr
                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
                LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
                WHERE
                jg.is_deleted = 0
                AND jgm.user_id = #{userId} )
            <if test="household.confirmFlag != null and household.confirmFlag != ''">
                and jh.confirm_flag =  #{household.confirmFlag}
            </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>
            and jh.is_deleted = 0
            and jh.confirm_flag = 0
        </where>
    </select>

    <!--查询物业-->
    <select id="getProperty" resultType="org.springblade.modules.house.vo.HouseholdOtherVO">
        SELECT
            jpcd.property_company_id as code,
            jpcd.principal as name,
            jpcd.principal_phone as phone
        FROM
            jczz_doorplate_address jda
        LEFT JOIN jczz_district jd ON jd.aoi_code = jda.aoi_code
        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 jpcd.property_company_id AS CODE,
               bu.name                  AS NAME,
               jpcd.principal_phone     AS phone
        FROM jczz_doorplate_address jda
         LEFT JOIN jczz_district jd ON jd.aoi_code = jda.aoi_code
         LEFT JOIN jczz_property_company_district jpcd ON jpcd.district_id = jd.id
         LEFT JOIN blade_user bu ON bu.id = jpcd.principal
        WHERE 1 = 1
          AND jda.address_code = #{household.houseCode} limit 1
    </select>

    <!--查询网格-->
@@ -485,12 +615,11 @@

    <!--查询公安信息-->
    <select id="getSecurity" resultType="org.springblade.modules.house.vo.HouseholdOtherVO">
        SELECT
            address_code as code,policeman as name,policeman_phone as phone
        FROM
            jczz_doorplate_address
        WHERE
          address_code = #{household.houseCode}
        SELECT address_code    as code,
               policeman       as name,
               policeman_phone as phone
        FROM jczz_doorplate_address
        WHERE address_code = #{household.houseCode}
    </select>


@@ -593,11 +722,12 @@

    <!--查询所有未入库的业主信息-->
    <select id="getNotInsertUserHousehold" resultType="org.springblade.modules.house.entity.HouseholdEntity">
        select jh.* from jczz_household jh
        select jh.*
        from jczz_household jh
        where jh.is_deleted = 0
        and jh.relationship = 1
        and jh.associated_user_id is null
        and jh.phone_number !=''
          and jh.relationship = 1
          and jh.associated_user_id is null
          and jh.phone_number !=''
        and length(jh.name)&lt;=12
    </select>