From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
index ac86398..f871b91 100644
--- a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.vo.CustomerVo;
+import com.ruoyi.sales.vo.CustomerTransactionsDetailsVo;
+import com.ruoyi.sales.vo.CustomerTransactionsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,7 +15,7 @@
/**
* 瀹㈡埛妗ｆMapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2025-05-07
*/
@@ -21,7 +24,7 @@
{
/**
* 鏌ヨ瀹㈡埛妗ｆ
- *
+ *
* @param id 瀹㈡埛妗ｆ涓婚敭
* @return 瀹㈡埛妗ｆ
*/
@@ -29,7 +32,7 @@
/**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
- *
+ *
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
@@ -37,7 +40,7 @@
/**
* 鏂板瀹㈡埛妗ｆ
- *
+ *
* @param customer 瀹㈡埛妗ｆ
* @return 缁撴灉
*/
@@ -45,7 +48,7 @@
/**
* 淇敼瀹㈡埛妗ｆ
- *
+ *
* @param customer 瀹㈡埛妗ｆ
* @return 缁撴灉
*/
@@ -53,7 +56,7 @@
/**
* 鍒犻櫎瀹㈡埛妗ｆ
- *
+ *
* @param id 瀹㈡埛妗ｆ涓婚敭
* @return 缁撴灉
*/
@@ -61,11 +64,17 @@
/**
* 鎵归噺鍒犻櫎瀹㈡埛妗ｆ
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
int deleteCustomerByIds(Long[] ids);
- IPage<CustomerDto> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer);
+ IPage<CustomerVo> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+
+ List<CustomerVo> list(@Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+
+ IPage<CustomerTransactionsVo> customewTransactions(Page page, @Param("customerName") String customerName);
+
+ IPage<CustomerTransactionsDetailsVo> customewTransactionsDetails(Page page, @Param("customerId") Long customerId);
}
--
Gitblit v1.9.3