From b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 16:30:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 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 2631023..b4dd989 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -15,24 +15,60 @@
<select id="selectMaxOrderId">
select
- ifnull(SUBSTR(max(order_id) from 9),0)
+ ifnull(SUBSTR(max(right(order_id,8)) from 7),0)
from
`order` as a
where
date(a.create_time) = curdate()
- order by id desc,order_id desc limit 1
+ /*order by order_id desc,order_id desc limit 1*/
</select>
<select id="selectMaxOrderIdByMonth">
select
- ifnull(SUBSTR(max(order_id) from 7),0)
+ ifnull(SUBSTR(max(right(order_id,8)) from 5),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>
-
+
+ <select id="selectMaxOrderIdByYear">
+ select
+ ifnull(SUBSTR(max(right(order_id,8)) from 3),0)
+ from
+ `order` as a
+ where
+ year(a.create_time) = year(now())
+ and a.id>400
+ </select>
+
+ <select id="selectOrderIdMin">
+ select count(*) from sd.`order` where SUBSTR(order_id,3,11)>#{substringInt}
+ </select>
+
+ <select id="selectOrderIdIs">
+ select count(*) from sd.`order` where SUBSTR(order_id,3,11)=#{substringInt}
+ </select>
+
+ <select id="selectOrderIdDay">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},9,2)=01
+ </select>
+
+ <select id="selectOrderIdMonth">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},7,4)=0001
+ </select>
+
+ <select id="selectOrderIdYear">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},5,2)=000001
+ </select>
+
+ <select id="selectOrderId">
+ select * from sd.`order` where order_id=#{orderId}
+ </select>
+
+ <update id="updateOrderId">
+ update sd.`order` set order_id=#{newOrderId} where order_id=#{oldOrderId}
+ </update>
<update id="updateOrderParameter">
update `order` o
@@ -114,6 +150,14 @@
<if test="order.salesman != null and order.salesman != ''">
and o.salesman REGEXP #{order.salesman}
</if>
+
+ <if test="order.creator != null and order.creator != ''">
+ and o.creator REGEXP #{order.creator}
+ </if>
+
+ <if test="order.verifier != null and order.verifier != ''">
+ and o.verifier REGEXP #{order.verifier}
+ </if>
<if test="order.perimeter != null and order.perimeter != ''">
and o.perimeter REGEXP #{order.perimeter}
@@ -203,6 +247,14 @@
and o.salesman REGEXP #{order.salesman}
</if>
+ <if test="order.creator != null and order.creator != ''">
+ and o.creator REGEXP #{order.creator}
+ </if>
+
+ <if test="order.verifier != null and order.verifier != ''">
+ and o.verifier REGEXP #{order.verifier}
+ </if>
+
<if test="order.perimeter != null and order.perimeter != ''">
and o.perimeter REGEXP #{order.perimeter}
</if>
@@ -261,7 +313,7 @@
</update>
<update id="updateMoney">
- update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
+ update `order` set money = #{order.money},calculate_type = #{order.calculateType},other_money=#{order.otherMoney} where order_id = #{order.orderId}
</update>
<update id="cancelOrder">
--
Gitblit v1.8.0