From 2ad08ea181d8ec1e2b4b90bd1ddd40a2ba595b59 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:08:25 +0800
Subject: [PATCH] 提交更新

---
 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 0f207ee..e730c2a 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -44,10 +44,10 @@
            </if>
 
            <if test="order.customerId != null and order.customerId != ''">
-               and o.customer_id REGEXP #{customerId}
+               and o.customer_id REGEXP #{order.customerId}
            </if>
            <if test="order.customerName != null and order.customerName != ''">
-               and o.customer_name REGEXP #{customerName}
+               and o.customer_name REGEXP #{order.customerName}
            </if>
            <if test="order.project != null and order.project != ''">
                and o.project REGEXP #{order.project}
@@ -60,7 +60,7 @@
            </if>
 
            <if test="order.area != null and order.area != ''">
-               and o.area REGEXP #{order.area}
+               and o.area REGEXP REGEXP_REPLACE(#{order.area}, '\\.0+$', '')
            </if>
            <if test="order.createTime != null and order.createTime != ''">
                and date(o.create_time) = #{order.createTime}
@@ -111,10 +111,10 @@
             </if>
 
             <if test="order.customerId != null and order.customerId != ''">
-                and o.customer_id REGEXP #{customerId}
+                and o.customer_id REGEXP #{order.customerId}
             </if>
             <if test="order.customerName != null and order.customerName != ''">
-                and o.customer_name REGEXP #{customerName}
+                and o.customer_name REGEXP #{order.customerName}
             </if>
             <if test="order.project != null and order.project != ''">
                 and o.project REGEXP #{order.project}
@@ -169,4 +169,8 @@
         update `order` set process_review = #{status} where order_id = #{id}
     </update>
 
+    <update id="updateMoney">
+        update `order` set money = #{order.money} where order_id = #{order.orderId}
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0