From 5fdb69748d19efb6d6fab1c2514cb9eef8bc2ff1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 08 Nov 2023 08:51:55 +0800
Subject: [PATCH] 地址表新增字段子门牌号

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index fafd2af..1f4c1aa 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/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 != ''
@@ -155,7 +167,7 @@
 
     <!--根据社区查询街路巷集合-->
     <select id="getStreetRuList" resultType="org.springblade.common.node.TreeNode" >
-        select street_ru_code as id,street_ru_name as name,2 as addressType from jczz_doorplate_address
+        select street_ru_code as id,street_ru_name as name,3 as addressType from jczz_doorplate_address
         where 1=1
         and aoi_code is null
         <if test="name != null and name!=''">
@@ -169,24 +181,31 @@
 
     <!--根据街路巷编号查询街路巷门牌名称集合-->
     <select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
-        select address_code as addressCode,doorplate_name as houseNo from jczz_doorplate_address
-        where 1=1
-		and street_ru_code = #{code}
-		and nei_code = #{name}
-		and aoi_code is null
+      select address_code as addressCode,doorplate_name as floor from jczz_doorplate_address
+      where 1=1
+      and street_ru_code = #{code}
+      and nei_code = #{name}
+      and aoi_code is null
     </select>
-    <select id="getDoorplateAddressDetail"
-            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
 
-    SELECT * FROM jczz_doorplate_address
-    WHERE 1=1
-    <if test="vo.stdId != null and vo.stdId != ''">
-        AND address_code = #{vo.stdId}
-    </if>
-    <if test="vo.buildingCode != null and vo.buildingCode !='' ">
-        AND building_code = #{vo.buildingCode}
-    </if>
+    <select id="getDoorplateAddressDetail"
+            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}
+        </if>
+        <if test="vo.buildingCode != null and vo.buildingCode !='' ">
+            AND building_code = #{vo.buildingCode}
+        </if>
     </select>
+
     <select id="getDoorplateAddressList"
             resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
         SELECT * FROM jczz_doorplate_address

--
Gitblit v1.9.3