From 7b09f233bde70508f6db7e08e983e9a2c4bb3e99 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 11 八月 2023 17:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/OrdersMapper.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/OrdersMapper.xml b/standard-server/src/main/resources/mapper/OrdersMapper.xml
index a691546..f9aaada 100644
--- a/standard-server/src/main/resources/mapper/OrdersMapper.xml
+++ b/standard-server/src/main/resources/mapper/OrdersMapper.xml
@@ -2,7 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.OrdersMapper">
<select id="selectAllOrder" resultType="java.util.Map">
- select order_code,
+ select o.id,
+ order_code,
department,
province,
salesman,
@@ -17,20 +18,20 @@
o.state
from mom_ocean.orders o,mom_ocean.material m
<where>
- <if test="orderCode != null">
- and order_code = #{orderCode}
+ <if test="orderCode != null and orderCode!=''">
+ and order_code LIKE CONCAT('%',#{orderCode},'%')
</if>
- <if test="time != null">
+ <if test="time != null and time!=''">
and o.create_time = #{time}
</if>
- <if test="name != null">
- and m.name = #{name}
+ <if test="name != null and name!=''">
+ and m.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="state != null">
+ <if test="state != null and state!=''">
and o.state = #{state}
</if>
and o.code=m.code
</where>
- order by o.create_time desc
+ order by o.id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3