From ac1f5097b08b9db6531e8dfeff12c5caf251d98e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 01 八月 2024 15:49:23 +0800
Subject: [PATCH] 订单首页显示备注信息
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index be5d178..8715439 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -25,12 +25,11 @@
<select id="selectMaxOrderIdByMonth">
select
- ifnull(SUBSTR(order_id from 7),0)
+ ifnull(SUBSTR(max(order_id) from 7),0)
from
`order` as a
where
date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
- order by id desc limit 1
</select>
@@ -148,6 +147,9 @@
<if test="order.warehousing != null ">
and o.warehousing = #{order.warehousing}
</if>
+ <if test="order.processingNote != null and order.processingNote != ''">
+ and o.processing_note REGEXP #{order.processingNote}
+ </if>
group by o.id
order by o.id desc
limit #{offset},#{pageSize}
@@ -233,6 +235,9 @@
<if test="order.warehousing != null ">
and o.warehousing = #{order.warehousing}
</if>
+ <if test="order.processingNote != null and order.processingNote != ''">
+ and o.processing_note REGEXP #{order.processingNote}
+ </if>
order by o.id desc
</select>
--
Gitblit v1.8.0