From e48e9687cc8bee98f5567807c2529cf7c7e9a9f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:47:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 5657ea8..57479f7 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -725,4 +725,24 @@
         ) as ss
     </select>
 
+    <select id="exportOrderProductSummary"  >
+        SELECT
+            *,
+            a.create_time as createTime,
+            d.type_name as level_one,
+            e.type_name as level_two
+        from order_detail as a
+                 left join sd.`order` as b
+                           on b.order_id = a.order_id
+                 left join sd.product as c
+                           on c.id = a.product_id
+                 left join sd.basic_glass_type as d
+                           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]}
+        group by b.order_id,a.product_id
+        order by b.order_id desc
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0