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'
---
sale-server/src/main/resources/mapper/SaleMapper.xml | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sale-server/src/main/resources/mapper/SaleMapper.xml b/sale-server/src/main/resources/mapper/SaleMapper.xml
index f95c784..f530a91 100644
--- a/sale-server/src/main/resources/mapper/SaleMapper.xml
+++ b/sale-server/src/main/resources/mapper/SaleMapper.xml
@@ -2,27 +2,27 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SaleMapper">
<select id="selectSaleList" resultType="java.util.Map">
- select order_number,
+ select id,
+ order_number,
code,
name,
proname,
type,
DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡'
from mom_ocean.sale
- <where>
- state=1
- <if test="orderNumber!=null">
- and order_number=#{orderNumber}
- </if>
- <if test="name!=null">
- and name=#{name}
- </if>
- <if test="type!=null">
- and type=#{type}
- </if>
- <if test="delTime!=null">
- and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
- </if>
- </where>
+ where state=1
+ <if test="orderNumber!=null and orderNumber!=''">
+ and order_number like concat('%',#{orderNumber},'%')
+ </if>
+ <if test="name!=null and name!=''">
+ and name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="type!=null and type!=''">
+ and type=#{type}
+ </if>
+ <if test="delTime!=null and delTime!=''">
+ and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
+ </if>
+ order by id desc
</select>
</mapper>
--
Gitblit v1.9.3