From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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 3dcd623..543e175 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -33,12 +33,13 @@
</select>
<select id="selectMaxOrderIdByYear">
- select
- ifnull(SUBSTR(max(order_id) from 5),0)
+ select ifnull((select
+ SUBSTR(order_id from 5)
from
`order` as a
where
- year(a.create_time) = year(NOW())
+ year(a.create_time) = year(now())
+ order by id desc limit 1),0) temp
</select>
<update id="updateOrderParameter">
--
Gitblit v1.8.0