本地最新代码:同步所有修改及新增模块
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
@@ -19,21 +19,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectAgvContainerTaskVo">
|
||||
select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
|
||||
select top 1 id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
|
||||
</sql>
|
||||
|
||||
<select id="selectAgvContainerTaskList" parameterType="AgvContainerTask" resultMap="AgvContainerTaskResult">
|
||||
<include refid="selectAgvContainerTaskVo"/>
|
||||
<where>
|
||||
<if test="container != null and container != ''"> and container = #{container}</if>
|
||||
<if test="startPoint != null and startPoint != ''"> and start_point = #{startPoint}</if>
|
||||
<if test="endPoint != null and endPoint != ''"> and end_point = #{endPoint}</if>
|
||||
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
|
||||
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
|
||||
<if test="taskNo != null and taskNo != ''"> and task_no = #{taskNo}</if>
|
||||
<if test="container != null and container != ''"> and container like concat('%', #{container}, '%')</if>
|
||||
<if test="startPoint != null and startPoint != ''"> and start_point like concat('%', #{startPoint}, '%')</if>
|
||||
<if test="endPoint != null and endPoint != ''"> and end_point like concat('%', #{endPoint}, '%')</if>
|
||||
<if test="startTime != null and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
|
||||
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
|
||||
<if test="taskNo != null and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
|
||||
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
|
||||
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
|
||||
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@@ -101,4 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteAgvJobByOrder" parameterType="string">
|
||||
delete from agv_container_task where container = #{order}
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user