区划树查询修改

zhongrj

2024-01-06 ad0bc4e763fa988a2ec4dd8dfab7381ea7726021

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

@@ -116,6 +116,78 @@
    <!--自定义分页数据查询-->
    <select id="selectHouseholdPage" resultMap="householdPageAndLabelMap">
        SELECT
        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.gender,jh.birthday,jh.id_card,jh.card_type,jh.hkmt_pass,
        ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
        jh.passport,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,
        jhs.district_name aoiName,
        concat( jhs.building, " ", unit, " ", room ) AS address,
        jda.town_street_name AS townStreetName,
        jda.nei_name AS neiName,
        jg.grid_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_range jgr on jgr.house_code=jda.address_code
        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
        <where>
            <if test="household.userId!=null">
                AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
                )
            </if>
            <if test="household.name!=null and household.name !=''">
                and jh.name like concat('%',#{household.name},'%')
            </if>
            <if test="household.houseCode!=null and household.houseCode !=''">
                and jh.house_code = #{household.houseCode}
            </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="household.regionCode!=null and household.regionCode!=''">
                and jg.community_code like concat('%',#{household.regionCode},'%')
            </if>
            and jh.is_deleted = 0
            order by jh.create_time desc
        </where>


    </select>

    <select id="getAllHouseHold" resultMap="householdPageAndLabelMap">
        SELECT
        jh.id,
        jh.house_code,
        jh.NAME,
@@ -197,12 +269,14 @@
            <if test="household.regionCode!=null and household.regionCode!=''">
                and jg.community_code like concat('%',#{household.regionCode},'%')
            </if>
            <if test="household.id!=null and household.id!=''">
                and jh.id = #{household.id}
            </if>
            and jh.is_deleted = 0
            order by jh.create_time desc
        </where>


    </select>


    <!--查询房屋集合信息-->
    <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeStringNode" >
@@ -216,9 +290,9 @@
               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 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>

    <!--查询房屋集合信息-->