From 44a9216a0c14d2377374a7bf8325ba841db85479 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期一, 22 七月 2024 11:25:01 +0800 Subject: [PATCH] 电磁锁状态修改提交 --- ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml index a4182a0..5d15653 100644 --- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml +++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml @@ -15,7 +15,7 @@ </resultMap> <sql id="selectArdVideoInspectRecordVo"> - select id, start_time, end_time, record_file_path, step_id, dept_id, user_id from ard_video_inspect_record + select id, start_time, end_time, record_file_path, step_id, dept_id, user_id,well_name from ard_video_inspect_record </sql> <select id="selectArdVideoInspectRecordList" parameterType="ArdVideoInspectRecord" resultMap="ArdVideoInspectRecordResult"> @@ -36,10 +36,17 @@ <if test="startTime != null and startTime != ''">and start_time like ('${startTime}%')</if> <if test="stepId != null and stepId != ''">and step_id = #{stepId}</if> </where> - select r.*,s.well_id,w.well_id as well_name from ard_video_inspect_record r ,ard_video_inspect_task_step - s,ard_alarmpoints_well w where start_time like ('${startTime}%') and r.step_id = s.id and s.well_id = w.id order by start_time desc </select> + <!--鎸夋棩鏈�,浠诲姟id鏌ヨ--> + <select id="selectTaskRecordByStartTime" resultType="java.util.HashMap"> + select r.*, s.task_id + from ard_video_inspect_record r + LEFT JOIN ard_video_inspect_task_step s on r.step_id = s.id + where s.task_id = '${taskId}' + and r.start_time like '${startTime}%' + order by r.start_time asc + </select> <!--鎸夋湀浠界粺璁℃枃浠舵暟閲�--> <select id="selectArdVideoInspectRecordCountByStartMonth" parameterType="String" resultType="java.util.HashMap"> select f.start_date,count(*) from -- Gitblit v1.9.3