From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
index ae18ea6..77d76c8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
@@ -1,10 +1,11 @@
package com.example.erp.mapper.sd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.example.erp.entity.sd.Order;
+import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -17,7 +18,22 @@
List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
- Map<String,Integer> getOrderReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+ //type涓轰簡鍖哄埆闇�涓嶉渶瑕佹牴鎹骇鍝佸垎绫�
+ Map<String,Integer> getOrderReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String type);
- List<Order> exportOrderReport();
+ List<OrderDTO> exportOrderReport(List<LocalDate> dates);
+
+ List<OrderDetail> getOrderProductSummary(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+
+ Map<String,Integer> getOrderProductSummaryTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String product);
+
+ List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates);
+
+ Map<String, String> getOrderProductDetailTag(String orderId);
+
+ List<Map<String,Object>> getOrderProductDistinctById(String orderId);
+
+ List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);
+
+
}
--
Gitblit v1.8.0