From 6c47588406827fa706e4068c692de3be0ae0188e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 04 十二月 2023 11:04:26 +0800
Subject: [PATCH] 雷达引导追踪优化

---
 ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
index c9fcb84..d6498b6 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -47,10 +47,11 @@
         <where>  
             <if test="taskName != null  and taskName != ''"> and task_name like '%'||#{taskName}||'%'</if>
             <if test="inspectMode != null  and inspectMode != ''"> and inspect_mode = #{inspectMode}</if>
+            <if test="menualSwitch != null and inspectMode != ''">and menual_switch= #{menualSwitch}</if>
             <if test="cameraId != null  and cameraId != ''"> and camera_id = #{cameraId}</if>
             <if test="channel != null "> and channel = #{channel}</if>
         </where>
-        order by id
+        order by start_time
     </select>
     
     <select id="selectArdVideoInspectTaskById" parameterType="String" resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
@@ -120,12 +121,33 @@
             <if test="channel != null">channel = #{channel},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="userId != null">user_id = #{userId},</if>
+<!--            <if test="currentStepId != null">current_step_id = #{currentStepId},</if>-->
+<!--            <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>-->
+        </trim>
+        where id = #{id}
+    </update>
+    <update id="updateArdVideoInspectTaskWithCurrentSetpInfo" parameterType="ArdVideoInspectTask">
+        update ard_video_inspect_task
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskName != null">task_name = #{taskName},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="repeatPeriod != null">repeat_period = #{repeatPeriod},</if>
+            <if test="inspectMode != null">inspect_mode = #{inspectMode},</if>
+            <if test="menualSwitch != null">menual_switch = #{menualSwitch},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="cameraId != null">camera_id = #{cameraId},</if>
+            <if test="channel != null">channel = #{channel},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="currentStepId != null">current_step_id = #{currentStepId},</if>
             <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>
         </trim>
         where id = #{id}
     </update>
-
     <delete id="deleteArdVideoInspectTaskById" parameterType="String">
         delete from ard_video_inspect_task where id = #{id}
     </delete>
@@ -154,4 +176,11 @@
             ( #{item.taskId}, #{item.deptId}, #{item.userId},  #{item.orderNumber}, #{item.recordingTime}, #{item.wellId})
         </foreach>
     </insert>
+
+    <!--鏌ヨ浠诲姟涓浉鏈哄凡浣跨敤鏃舵-->
+    <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.HashMap">
+        select t.start_time,t.end_time from ard_video_inspect_task t
+        where t.camera_id=#{cameraId}
+        ORDER BY t.start_time
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3