From 7d1dcd74604d8a1b4369cf2f966cc6b628893fc7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 17 七月 2024 11:13:43 +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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 28407b3..2b59dbb 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,7 @@
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.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
@@ -29,13 +30,17 @@
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);
- List<Map<String,Object>> getOrderProductDistinctByIds(String orderId,String productId);
+ List<Map<String,Object>> getOrderProductDistinctByIds(String orderId,List<String> productId);
List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);
+ List<Map<String,Object>> getOrderProductByProductIds(Object productId, String orderId);
+
}
--
Gitblit v1.8.0