From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/resources/mapper/CommandInfoMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml
index af28896..e2158ff 100644
--- a/src/main/resources/mapper/CommandInfoMapper.xml
+++ b/src/main/resources/mapper/CommandInfoMapper.xml
@@ -6,14 +6,38 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfo">
<id column="id" property="id" />
<result column="wrk_no" property="wrkNo" />
+ <result column="task_no" property="taskNo" />
<result column="command_status" property="commandStatus" />
<result column="start_time" property="startTime" />
- <result column="end_time" property="endTime" />
<result column="command_type" property="commandType" />
<result column="device" property="device" />
<result column="device_log" property="deviceLog" />
<result column="command_desc" property="commandDesc" />
+ <result column="execute_time" property="executeTime" />
+ <result column="complete_time" property="completeTime" />
</resultMap>
+ <select id="selectByTaskNoAndWrkNo" resultMap="BaseResultMap">
+ select * from wcs_command_info
+ where wrk_no = #{wrkNo}
+ and task_no = #{taskNo}
+ </select>
+
+ <select id="selectByWrkNo" resultMap="BaseResultMap">
+ select * from wcs_command_info
+ where wrk_no = #{wrkNo}
+ </select>
+
+ <select id="selectByTaskNo" resultMap="BaseResultMap">
+ select * from wcs_command_info
+ where task_no = #{taskNo}
+ </select>
+
+ <select id="selectCompleteManualCommand" resultMap="BaseResultMap">
+ select * from wcs_command_info
+ where command_type = 2
+ and command_status = 3
+ </select>
+
</mapper>
--
Gitblit v1.9.1