From 2a5cdf98e669f724758865135f5fefabf7c8f185 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 04 九月 2023 09:23:51 +0800
Subject: [PATCH] 井业务修改井号唯一性验证 电子围栏报警时间改为alarmTime
---
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
index 8b9dc65..d6498b6 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -51,7 +51,7 @@
<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">
@@ -121,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>
@@ -159,7 +180,7 @@
<!--鏌ヨ浠诲姟涓浉鏈哄凡浣跨敤鏃舵-->
<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}
+ where t.camera_id=#{cameraId}
ORDER BY t.start_time
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3