From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
index d6705cb..86622ca 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
@@ -2,6 +2,8 @@
 
 import com.example.erp.entity.sd.Customer;
 import com.example.erp.entity.sd.Delivery;
+import com.example.erp.entity.sd.DeliveryDetail;
+import com.example.erp.entity.sd.OrderDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.repository.CrudRepository;
@@ -13,16 +15,22 @@
 public interface CustomerMapper extends CrudRepository<Customer,Long> {
 
     List<Customer> getCustomerList();
-    List<Customer> getseletCustomer(@Param("offset") Integer offset,
+    List<Customer> getSelectCustomer(@Param("offset") Integer offset,
                                          @Param("pageSize") Integer pageSize,
                                          @Param("customer") Customer customer);
 
 
-    Map<String,Integer> getseletCustomerPageTotal(Integer offset, Integer pageSize, Customer customer);
+    Map<String,Integer> getSelectCustomerPageTotal(Integer offset, Integer pageSize, Customer customer);
 
     Boolean insertCustomer(@Param("customer") Customer customer);
 
     Boolean updateCustomer(@Param("customer") Customer customer);
 
     Boolean deleteCustomer(@Param("customer") Customer customer);
+
+    List<OrderDetail> getSelectCustomerOderDate(@Param("offset") Integer offset,
+                                                    @Param("pageSize") Integer pageSize, String startDate, String endDate,
+                                                    @Param("orderDetail") OrderDetail orderDetail);
+
+    Map<String,Integer> getSelectCustomerOderDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate, OrderDetail orderDetail);
 }

--
Gitblit v1.8.0