From a5d3da1c7d435a2c76c022b818bce220cec58681 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 02 八月 2023 10:06:38 +0800
Subject: [PATCH] 指挥端-历史任务查询接口增加按app用户id过滤

---
 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index f535c75..50e2d82 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -28,10 +28,10 @@
         <!--                    resultMap="ArdAppTaskDetailResult"/>-->
     </resultMap>
     <resultMap id="ArdAppTaskSub1Result" type="ArdAppTask" extends="ArdAppTaskResult">
-                <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
-                            resultMap="ArdAppTaskPicResult"/>
-                <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"
-                            resultMap="ArdAppTaskDetailResult"/>
+        <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
+                    resultMap="ArdAppTaskPicResult"/>
+        <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"
+                    resultMap="ArdAppTaskDetailResult"/>
     </resultMap>
     <resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult">
         <result property="id" column="sub1_id"/>
@@ -158,21 +158,29 @@
             </if>
         </where>
     </select>
-
+    <select id="selectArdAppTaskDetailListByTaskId" resultType="ArdAppTaskDetail">
+        select * from ard_app_task_detail where task_id=#{taskId}
+    </select>
     <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSub1Result">
         <include refid="selectArdAppTaskDto"/>
         where a.id = #{id}
     </select>
 
     <select id="selectArdAppTaskDetailListByIdAndUserId" resultType="ArdAppTaskDetail">
-        select * from ard_app_task_detail d
-        where d.task_id = #{id} and d.user_id = #{detailUserId}
+        select *
+        from ard_app_task_detail d
+        where d.task_id = #{id}
+          and d.user_id = #{detailUserId}
     </select>
     <select id="selectArdAppTaskPicListById" resultType="ArdAppTaskPic">
-        select * from ard_app_task_pic d where d.task_id = #{id}
+        select *
+        from ard_app_task_pic d
+        where d.task_id = #{id}
     </select>
     <select id="selectArdAppTaskDetailUserIdsByTaskId" parameterType="String" resultType="java.lang.String">
-        select DISTINCT(user_id) from ard_app_task_detail where task_id=#{taskId}
+        select DISTINCT(user_id)
+        from ard_app_task_detail
+        where task_id = #{taskId}
     </select>
 
 

--
Gitblit v1.9.3