From 2b382a92207dfabf0eb30e743265df5c7c50e7bc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:27:45 +0800
Subject: [PATCH] feat(approve): 新增办公用品审批功能

---
 src/main/java/com/ruoyi/basic/service/ICustomerService.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index c27dd92..b725216 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,9 +4,9 @@
 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.dto.CustomerPrivatePoolDto;
 import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.basic.vo.CustomerVo;
+import com.ruoyi.framework.web.domain.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -33,7 +33,7 @@
      * @param id 瀹㈡埛妗f涓婚敭
      * @return 瀹㈡埛璇︽儏DTO
      */
-    Customer selectCustomerDetailById(Long id);
+    CustomerVo selectCustomerDetailById(Long id);
 
     /**
      * 鏌ヨ瀹㈡埛妗f鍒楄〃
@@ -75,9 +75,22 @@
      */
     List<Map<String, Object>> customerList(Customer customer);
 
-    List<Customer> selectCustomerLists(Customer customer);
+    List<CustomerVo> selectCustomerLists(CustomerDto customer);
 
-    AjaxResult importData(MultipartFile file);
+    R importData(MultipartFile file, Integer type);
 
-    IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
+    IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
+
+    void assignCustomer(CustomerDto customer);
+
+    void recycleCustomer(CustomerDto customer);
+
+    /**
+     * 鍏变韩瀹㈡埛缁欏叾浠栫敤鎴�
+     *
+     * @param customerDto 瀹㈡埛DTO锛堝寘鍚鎴稩D鍜屽叡浜敤鎴稩D鍒楄〃锛�
+     */
+    void together(CustomerDto customerDto);
+
+    Boolean back(Long id);
 }

--
Gitblit v1.9.3