From 0a567fd9c3baeb8022c77fa1a6a96d4c60cfa11c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 23 五月 2024 08:18:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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 2cf1634..5657ea8 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -392,12 +392,12 @@
</if>
</select>
- <select id="exportOrderReport">
+ <select id="exportOrderReport" >
SELECT
*,
a.create_time as createTime,
- d.type_name as levelOne,
- e.type_name as levelTwo
+ 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
@@ -407,7 +407,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) <= #{dates[1]}
</select>
--
Gitblit v1.8.0