From 20439bc0fa1ff714ed5f61e711272deebb76e2c9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 17 八月 2023 16:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml
index a97c646..c36c9b4 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml
@@ -20,7 +20,7 @@
<select id="selectArdVideoInspectTaskStepList" parameterType="ArdVideoInspectTaskStep" resultMap="ArdVideoInspectTaskStepResult">
<include refid="selectArdVideoInspectTaskStepVo"/>
- <where>
+ <where>
<if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
@@ -29,6 +29,13 @@
<if test="wellId != null and wellId != ''"> and well_id = #{wellId}</if>
</where>
</select>
+ <select id="selectByTaskId" parameterType="String" resultType="java.util.HashMap">
+ select s.*, w.well_id as well_name
+ from ard_video_inspect_task_step s,
+ ard_alarmpoints_well w
+ where s.task_id = #{taskId}
+ and s.well_id = w.id
+ </select>
<select id="selectArdVideoInspectTaskStepByTaskId" parameterType="String" resultMap="ArdVideoInspectTaskStepResult">
<include refid="selectArdVideoInspectTaskStepVo"/>
--
Gitblit v1.9.3