From 24e152d8a574e77b1909a8fea4703d4fe835c2a5 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 05 七月 2024 11:53:07 +0800
Subject: [PATCH] 查询电磁锁及挂接的车辆提交

---
 ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 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..fffe942 100644
--- a/ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml
+++ b/ard-work/src/main/resources/mapper/dispatch/ArdDispatchPoliceMapper.xml
@@ -17,23 +17,26 @@
         <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"/>
+        <collection property="sysUserList" ofType="java.util.List" select="getSysUserListByMainTableId" column="id"/>
     </resultMap>
-    <select id="getUserIdsByMainTableId" resultType="java.lang.String">
-        SELECT user_id
-        FROM ard_dispatch_police_user
+    <select id="getSysUserListByMainTableId" resultType="SysUser">
+        SELECT u.*
+        FROM ard_dispatch_police_user b
+                 left join sys_user u on b.user_id = u.user_id
         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" notNullColumn="sub_dispatch_id" javaType="java.util.List"
+                    resultMap="SysUserListResult"/>
     </resultMap>
 
-    <resultMap type="ArdDispatchPoliceUser" id="ArdDispatchPoliceUserResult">
-        <result property="dispatchId" column="sub_dispatch_id"/>
+    <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">
@@ -75,8 +78,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