From 0fc6a5ac6b228b432a48a267a4bfd0cb38116bae Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 17 七月 2025 13:32:13 +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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 b0afeb4..69266bb 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,13 @@
package com.example.erp.mapper.sd;
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;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -15,7 +18,36 @@
boolean updateOrderMoney( List<OrderDetail> orderDetails);
- List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+ List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, Integer model, Integer scope);
- 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<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);
+
+ 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,List<String> productId);
+
+ 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