From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml | 4 +---
1 files changed, 1 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..b98e0c6 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,8 +36,6 @@
<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>
<!--鎸夋湀浠界粺璁℃枃浠舵暟閲�-->
--
Gitblit v1.9.3