From 4a9566ba1c800535504462b06a93b1a6e5092f28 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期六, 03 六月 2023 21:11:03 +0800
Subject: [PATCH] 解决手动巡检启动2次的问题
---
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml | 13 +++++++++++--
1 files changed, 11 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 dd90643..8101ae7 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -47,9 +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 start_time
</select>
<select id="selectArdVideoInspectTaskById" parameterType="String" resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
@@ -148,9 +150,16 @@
</delete>
<insert id="batchArdVideoInspectTaskStep">
- insert into ard_video_inspect_task_step( task_id, dept_id, user_id, id, order_number, recording_time, well_id) values
+ insert into ard_video_inspect_task_step( task_id, dept_id, user_id, order_number, recording_time, well_id) values
<foreach item="item" index="index" collection="list" separator=",">
- ( #{item.taskId}, #{item.deptId}, #{item.userId}, #{item.id}, #{item.orderNumber}, #{item.recordingTime}, #{item.wellId})
+ ( #{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=#{startMonth}
+ ORDER BY t.start_time
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3