From 6d6ac6f6bbe92712f4872dcf6287eea5619d6737 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 27 三月 2025 09:08:23 +0800
Subject: [PATCH] 添加 显示订单超时状态问题

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 5b496f1..5a7f36e 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -258,7 +258,7 @@
     <select id="exportOrderSummary"  >
         SELECT *
         from sd.`order` as b
-        where  date(b.create_time)>=#{dates[0]} and date(b.create_time) &lt;= #{dates[1]} and b.create_order>0
+        where  date(b.create_time)>=#{dates[0]} and date(b.create_time) &lt;= #{dates[1]} and b.order_review>0
         order by b.id desc
     </select>
 
@@ -565,7 +565,7 @@
                    on d.type_id = c.type_id
          left join sd.basic_glass_type as e
                    on e.type_id = d.belong
-        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]} and b.create_order>0
+        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]} and b.order_review>0
     </select>
 
 
@@ -978,7 +978,7 @@
                  left join sd.basic_glass_type as e
                            on e.type_id = d.belong
         where date(b.create_time) >= #{dates[0]}
-          and date(b.create_time) &lt;= #{dates[1]} and b.create_order>0
+          and date(b.create_time) &lt;= #{dates[1]} and b.order_review>0
         group by b.order_id, a.product_id
         order by b.order_id desc
     </select>
@@ -1005,8 +1005,9 @@
 
             (a.product_id) as 'productId',
                     a.product_name as 'productName',
+                    p.remarks as 'remarks',
                     a.order_number as 'orderNumber'
-        from order_detail as a
+        from order_detail as a left join sd.product p on a.product_id=p.id
         where a.order_id = #{orderId}
         group by a.product_id
     </select>
@@ -1016,8 +1017,9 @@
 
         (a.product_id) as 'productId',
         a.product_name as 'productName',
+        p.remarks as 'remarks',
         a.order_number as 'orderNumber'
-        from order_detail as a
+        from sd.order_detail as a left join sd.product p on a.product_id=p.id
         where a.order_id = #{orderId} and a.product_id IN
         <foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
             #{item}

--
Gitblit v1.8.0