From bdc340b2594dccd1349c5a848b3a285d2c489133 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 11:20:12 +0800
Subject: [PATCH] 巡检计划搜索联查

---
 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 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..1f65a23 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>
 
 
@@ -331,7 +339,7 @@
         from ard_app_task_detail c
         where c.id = #{id}
     </select>
-    <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSubResult">
+    <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSub1Result">
         <include refid="selectArdAppTaskDto"/>
         where c.user_id = #{userId} AND c.view_flag is null
         order by create_time desc limit 1

--
Gitblit v1.9.3