From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskStepMapper.xml
index 7cb49a8..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>
@@ -28,6 +28,13 @@
<if test="recordingTime != null and recordingTime != ''"> and recording_time = #{recordingTime}</if>
<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">
@@ -62,12 +69,11 @@
<trim prefix="SET" suffixOverrides=",">
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if>
- <if test="id != null">id = #{id},</if>
<if test="orderNumber != null">order_number = #{orderNumber},</if>
<if test="recordingTime != null">recording_time = #{recordingTime},</if>
<if test="wellId != null">well_id = #{wellId},</if>
</trim>
- where task_id = #{taskId}
+ where id = #{id}
</update>
<delete id="deleteArdVideoInspectTaskStepByTaskId" parameterType="String">
--
Gitblit v1.9.3