From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 65bed44..f76f5aa 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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.dto.sd.OrderDTO;
+import com.example.erp.dto.sd.OrderDetailProductDTO;
+import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
@@ -29,6 +31,8 @@
List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates);
+ List<OrderDetailProductDTO> exportOrderReportProduct(List<LocalDate> dates);
+
Map<String, String> getOrderProductDetailTag(String orderId);
List<Map<String,Object>> getOrderProductDistinctById(String orderId);
@@ -37,5 +41,13 @@
List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);
+ List<Map<String,Object>> getOrderProductByProductIds(Object productId, String orderId);
+
+ List<Order> getOrderSummaryReport(Integer offset, Integer pageSize, String startDate, String endDate, Order order);
+
+ Map<String,Integer> getOrderSummaryReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order, String type);
+
+ List<Order> exportOrderSummary(List<LocalDate> dates);
+
}
--
Gitblit v1.8.0