From 6954d7e19ea0a97eeecec33a28e396f22ea33707 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期五, 18 四月 2025 14:44:54 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml
index 17bd8c8..3b1aad1 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml
@@ -2,14 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.acs.manager.manager.mapper.TaskMapper">
- <!-- 鍏宠仈鏌ヨsql -->
- <sql id="selectSql">
+ <!-- 鍒嗛〉鏌ヨ -->
+ <select id="selectPageRel" resultType="com.zy.acs.manager.manager.entity.Task">
SELECT a.*
FROM man_task a
<where>
AND a.deleted = 0
<if test="param.id != null">
AND a.id = #{param.id}
+ </if>
+ <if test="param.busId != null">
+ AND a.bus_id = #{param.busId}
+ </if>
+ <if test="param.seqNum != null">
+ AND a.seq_num like concat('%',#{param.seqNum},'%')
</if>
<if test="param.taskType != null">
AND a.task_type = #{param.taskType}
@@ -20,22 +26,38 @@
<if test="param.agvId != null">
AND a.agv_id = #{param.agvId}
</if>
+ <if test="param.oriSta != null">
+ AND a.ori_sta = #{param.oriSta}
+ </if>
+ <if test="param.oriLoc != null">
+ AND a.ori_loc = #{param.oriLoc}
+ </if>
+ <if test="param.destSta != null">
+ AND a.dest_sta = #{param.destSta}
+ </if>
+ <if test="param.destLoc != null">
+ AND a.dest_loc = #{param.destLoc}
+ </if>
+ <if test="param.destCode != null">
+ AND a.dest_code = #{param.destCode}
+ </if>
<if test="param.status != null">
AND a.status = #{param.status}
+ </if>
+ <if test="param.timeStart != null">
+ and a.create_time >= #{param.timeStart}
+ </if>
+ <if test="param.timeEnd != null">
+ and a.create_time < #{param.timeEnd}
</if>
<if test="param.keywords != null">
AND (
a.memo LIKE CONCAT('%', #{param.keywords}, '%')
- OR a.memo LIKE CONCAT('%', #{param.keywords}, '%')
+ OR a.seq_num LIKE CONCAT('%', #{param.keywords}, '%')
)
</if>
</where>
- order by a.create_time desc
- </sql>
-
- <!-- 鍒嗛〉鏌ヨ -->
- <select id="selectPageRel" resultType="com.zy.acs.manager.manager.entity.Task">
- <include refid="selectSql"/>
+ ORDER BY FIELD(a.task_sts, 18, 17, 16, 15, 20, 19), io_time DESC
</select>
<select id="selectStatByLastSevenDays" resultType="java.util.Map">
--
Gitblit v1.9.1