From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
index 4e86772..0168bb0 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
@@ -2,39 +2,6 @@
<!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.AgvMapper">
- <!-- 鍏宠仈鏌ヨsql -->
- <sql id="selectSql">
- SELECT a.*
- FROM man_agv a
- <where>
- AND a.deleted = 0
- <if test="param.id != null">
- AND a.id = #{param.id}
- </if>
- <if test="param.uuid != null">
- AND a.uuid = #{param.uuid}
- </if>
- <if test="param.name != null">
- AND a.name = #{param.name}
- </if>
- <if test="param.status != null">
- AND a.status = #{param.status}
- </if>
- <if test="param.createTimeStart != null">
- AND a.create_time >= #{param.createTimeStart}
- </if>
- <if test="param.createTimeEnd != null">
- AND a.create_time <= #{param.createTimeEnd}
- </if>
- <if test="param.keywords != null">
- AND (
- a.ip LIKE CONCAT('%', #{param.keywords}, '%')
- OR a.memo LIKE CONCAT('%', #{param.keywords}, '%')
- )
- </if>
- </where>
- </sql>
-
<select id="selectPageRel" resultType="com.zy.acs.manager.manager.controller.result.AgvResult">
select
ma.*,
@@ -42,6 +9,17 @@
from man_agv ma
left join man_agv_detail mad on ma.id = mad.agv_id
where 1=1
+ and ma.deleted = 0
+ <if test="param.uuid != null">
+ AND ma.uuid = #{param.uuid}
+ </if>
+ <if test="param.pos != null">
+ AND mad.pos = #{param.pos}
+ </if>
+ <if test="param.agvModel != null">
+ AND ma.agv_model = #{param.agvModel}
+ </if>
+ order by CONVERT(ma.uuid, UNSIGNED) asc
</select>
</mapper>
--
Gitblit v1.9.1