From 6e87185c84d90e242ad93e47567c4b5e2be0c8d7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 10:38:53 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 83830b8..0c07db1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.example.erp.common.Constants;
+import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.exception.ServiceException;
@@ -311,8 +312,8 @@
return map;
}
- public List<Order> exportOrderReport() {
- return orderDetailMapper.exportOrderReport();
+ public List<OrderDTO> exportOrderReport(List<LocalDate> dates) {
+ return orderDetailMapper.exportOrderReport(dates);
}
public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
@@ -338,4 +339,8 @@
// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
return map;
}
+
+ public List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates) {
+ return orderDetailMapper.exportOrderProductSummary(dates);
+ }
}
--
Gitblit v1.8.0