From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +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/CustomerMapper.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 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..f201570 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
@@ -1,7 +1,10 @@
package com.example.erp.mapper.sd;
+import com.example.erp.dto.sd.CustomerDTO;
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 +16,36 @@
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<Map<String,Object>> getSelectCustomerOderDate(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize, String startDate, String endDate,
+ @Param("orderDetail") OrderDetail orderDetail);
+
+ List<Map<String,Object>> getSelectCustomerDeliveryDate(@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);
+
+ Map<String,Integer> getSelectCustomerDeliveryDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate, OrderDetail orderDetail);
+
+ List<CustomerDTO> exportSelectCustomerOderDate(String startDate, String endDate,
+ @Param("orderDetail") OrderDetail orderDetail);
+
+ List<CustomerDTO> exportSelectCustomerDeliveryDate(String startDate, String endDate,
+ @Param("orderDetail") OrderDetail orderDetail);
+
+ List<Map<String,Object>> getProjectList(Long id);
}
--
Gitblit v1.8.0