From 661d3c6bd42733aeb0ca83aee72f6b83bef4de36 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 18 三月 2026 16:30:56 +0800
Subject: [PATCH] fix(sales): 修复导出合同文件名编码及空指针问题
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index b1c7ec5..989e474 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -1,9 +1,15 @@
package com.ruoyi.basic.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
+import java.util.Map;
/**
* 瀹㈡埛妗ｆService鎺ュ彛
@@ -21,12 +27,20 @@
Customer selectCustomerById(Long id);
/**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
+ */
+ CustomerDto selectCustomerDetailById(Long id);
+
+ /**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
- List<Customer> selectCustomerList(Customer customer);
+ IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer);
/**
* 鏂板瀹㈡埛妗ｆ
@@ -53,4 +67,15 @@
int deleteCustomerByIds(Long[] ids);
List<Customer> selectCustomerListByIds(Long[] ids);
+
+ /**
+ * 鏌ヨ瀹㈡埛淇℃伅
+ *
+ * @return 缁撴灉
+ */
+ List<Map<String, Object>> customerList(Customer customer);
+
+ List<Customer> selectCustomerLists(Customer customer);
+
+ AjaxResult importData(MultipartFile file);
}
--
Gitblit v1.9.3