From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 86622ca..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,5 +1,6 @@
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;
@@ -28,9 +29,23 @@
Boolean deleteCustomer(@Param("customer") Customer customer);
- List<OrderDetail> getSelectCustomerOderDate(@Param("offset") Integer offset,
+ 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