From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index add8f40..57931dc 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -179,9 +179,6 @@
<if test="order.createTime != null and order.createTime != ''">
and o.create_time REGEXP #{order.createTime}
</if>
- <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
- </if>
</where>
group by o.order_id order by o.id desc
limit #{offset},#{pageSize};
@@ -236,9 +233,6 @@
</if>
<if test="order.createTime != null and order.createTime != ''">
and o.create_time REGEXP #{order.createTime}
- </if>
- <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
</if>
</where>
group by o.order_id limit #{offset},#{pageSize}) as zu;
@@ -350,7 +344,16 @@
</where>
group by d.delivery_id
- order by d.id desc
+ order by
+ <if test="orderBy == null ">
+ d.id desc
+ </if>
+ <if test="orderBy == 'desc'">
+ d.${field} desc
+ </if>
+ <if test="orderBy == 'asc'">
+ d.${field}
+ </if>
limit #{offset},#{pageSize};
</select>
@@ -414,7 +417,7 @@
<select id="selectByDate">
select * from sd.delivery
- where create_time between #{startDate} and #{endDate}
+ where date(create_time) between #{startDate} and #{endDate}
</select>
--
Gitblit v1.8.0