From bc6ac2f55b2ddec81614ebf7722760b4868f76db Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 24 八月 2023 16:11:27 +0800
Subject: [PATCH] 修改派警list返回用户信息

---
 ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml b/ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml
index 6b0882c..90d8a53 100644
--- a/ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml
+++ b/ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml
@@ -16,39 +16,39 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
-        <!-- 瀛愭煡璇紝鍏宠仈 ard_dispatch_police_user 琛� -->
-        <collection property="ardDispatchPoliceUserList" ofType="java.lang.String" select="getUserIdsByMainTableId"
-                    column="id"/>
-    </resultMap>
-    <select id="getUserIdsByMainTableId" resultType="java.lang.String">
-        SELECT user_id
-        FROM ard_dispatch_police_user
-        WHERE dispatch_id = #{id}
-    </select>
-    <resultMap id="ArdDispatchPoliceArdDispatchPoliceUserResult" type="ArdDispatchPolice"
-               extends="ArdDispatchPoliceResult">
-        <collection property="ardDispatchPoliceUserList" notNullColumn="sub_dispatch_id" javaType="java.util.List"
-                    resultMap="ArdDispatchPoliceUserResult"/>
+        <collection property="sysUserList" javaType="java.util.List" resultMap="SysUserListResult"/>
     </resultMap>
 
-    <resultMap type="ArdDispatchPoliceUser" id="ArdDispatchPoliceUserResult">
-        <result property="dispatchId" column="sub_dispatch_id"/>
+    <resultMap id="ArdDispatchPoliceArdDispatchPoliceUserResult" type="ArdDispatchPolice"
+               extends="ArdDispatchPoliceResult">
+        <collection property="sysUserList" notNullColumn="sub_dispatch_id" javaType="java.util.List"
+                    resultMap="SysUserListResult"/>
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserListResult">
         <result property="userId" column="sub_user_id"/>
+        <result property="nickName" column="sub_nick_name"/>
+        <result property="deptId" column="sub_dept_id"/>
     </resultMap>
 
     <sql id="selectArdDispatchPoliceVo">
-        SELECT ID,
-               NAME,
-               text,
-               longitude,
-               latitude,
-               dept_id,
-               user_id,
-               create_by,
-               create_time,
-               update_by,
-               update_time
-        FROM ard_dispatch_police
+        SELECT adp.ID,
+               adp.NAME,
+               adp.text,
+               adp.longitude,
+               adp.latitude,
+               adp.dept_id,
+               adp.user_id,
+               adp.create_by,
+               adp.create_time,
+               adp.update_by,
+               adp.update_time,
+               u.user_id     as sub_user_id,
+               u.nick_name   as sub_nick_name,
+               u.dept_id     as sub_dept_id
+        FROM ard_dispatch_police adp
+        left join ard_dispatch_police_user b on b.dispatch_id = adp.id
+        left join sys_user u on b.user_id = u.user_id
     </sql>
 
     <select id="selectArdDispatchPoliceList" parameterType="ArdDispatchPolice" resultMap="ArdDispatchPoliceResult">
@@ -75,8 +75,9 @@
                a.create_time,
                a.update_by,
                a.update_time,
-               b.dispatch_id as sub_dispatch_id,
-               b.user_id     as sub_user_id
+               b.user_id     as sub_user_id,
+               b.nick_name   as sub_nick_name,
+               b.dept_id     as sub_dept_id
         from ard_dispatch_police a
                  left join ard_dispatch_police_user b on b.dispatch_id = a.id
         where a.id = #{id}

--
Gitblit v1.9.3