Merge remote-tracking branch 'origin/master'

linwe

2023-12-21 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml

@@ -5,7 +5,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="districtResultMap" type="org.springblade.modules.district.entity.DistrictEntity">
        <result column="id" property="id"/>
        <result column="aoi_cdoe" property="aoiCdoe"/>
        <result column="aoi_code" property="aoiCode"/>
        <result column="community_code" property="communityCode"/>
        <result column="name" property="name"/>
        <result column="address" property="address"/>
@@ -19,9 +19,49 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <!--自定义分页-->
    <select id="selectDistrictPage" resultType="org.springblade.modules.district.vo.DistrictVO">
        select
        jd.*,
        br.village_name as communityName,br.town_name as townStreetName
        from jczz_district jd
        left join blade_region br on br.code = jd.community_code
        where jd.is_deleted = 0
        <if test="district.name !=null and district.name !=''">
            and jd.name like concat('%',#{district.name},'%')
        </if>
        <if test="district.communityCode !=null and district.communityCode !=''">
            and jd.community_code = #{district.communityCode}
        </if>
    </select>

    <select id="selectDistrictPage" resultMap="districtResultMap">
        select * from jczz_district where is_deleted = 0
    <!--小区树查询-->
    <select id="getDistrictTree" resultType="org.springblade.common.node.TreeStringNode">
        SELECT
        code as id,
        parent_code as parentId,
        name
        FROM blade_region where district_code = '361102'
        union all
        (
        select
        id,
        community_code as parentId,
        name
        from jczz_district
        where is_deleted = 0
        )
    </select>

    <!--小区自定义获取详情查询-->
    <select id="getDetail" resultType="org.springblade.modules.district.vo.DistrictVO">
        SELECT
        jd.*,
        jda.nei_code as communityCode,jda.nei_name as communityName
        FROM jczz_district jd
        left join jczz_doorplate_address jda on jda.aoi_code = jd.aoi_code
        where jd.is_deleted = 0
        and jda.address_code = #{district.houseCode}
    </select>