Merge remote-tracking branch 'origin/master'

linwe

2023-11-09 365b5ad817c9c8a2992d505aa39eccfa2be0460e

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -2,6 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper">

    <!--门牌地址详情查询-->
    <resultMap id="doorplateAddressDetailMap" type="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO"
               autoMapping="true">
        <id property="id" column="id"/>
        <association property="place" javaType="org.springblade.modules.place.vo.PlaceVO"
                    autoMapping="true">
            <id property="id" column="cid"/>
            <result property="createTime" column="pcreateTime"/>
            <result property="createUserName" column="createUserName"/>
        </association>
    </resultMap>

    <!--自定义分页查询-->
    <select id="selectDoorplateAddressPage" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
        select * from jczz_doorplate_address where 1=1
@@ -90,7 +102,7 @@
            jh.name as realName,jh.role_type as roleType,1 as addressType
            from jczz_doorplate_address jda
            left join
                (select house_code,name,role_type from jczz_household where role_type = '业主') jh
                (select house_code,name,role_type from jczz_household where role_type = 1) jh
            on jda.address_code = jh.house_code
            where 1=1
            and floor != ''
@@ -169,16 +181,23 @@

    <!--根据街路巷编号查询街路巷门牌名称集合-->
    <select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
      select address_code as addressCode,doorplate_name as floor from jczz_doorplate_address
      select address_code as addressCode,concat(doorplate_num,sub_door_plate_no) as floor from jczz_doorplate_address
      where 1=1
      and street_ru_code = #{code}
      and nei_code = #{name}
      and aoi_code is null
      order by doorplate_num,sub_door_plate_no
    </select>

    <select id="getDoorplateAddressDetail"
            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
        SELECT * FROM jczz_doorplate_address
            resultMap="doorplateAddressDetailMap">
        SELECT
            jda.*,
            jp.id as cid,jp.*,jp.create_time as pcreateTime,
            bu.real_name as createUserName
        FROM jczz_doorplate_address jda
        left join jczz_place jp on jda.address_code = jp.house_code and jp.is_deleted = 0
        left join blade_user bu on bu.id = jp.create_user and bu.is_deleted = 0
        WHERE 1=1
        <if test="vo.stdId != null and vo.stdId != ''">
            AND address_code = #{vo.stdId}