From 271f4a25576ac6c2c8f2c4eb4c9782d6eef85124 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 13:13:55 +0800
Subject: [PATCH] 修改报错

---
 src/main/java/com/ruoyi/basic/controller/CustomerController.java |   81 +++++++++++++++++++++++++++++++---------
 1 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index c1c66d9..866153b 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -1,17 +1,22 @@
 package com.ruoyi.basic.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CustomerDto;
 import com.ruoyi.basic.pojo.Customer;
 import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.vo.CustomerVo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.domain.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -30,10 +35,9 @@
      * 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
      */
     @GetMapping("/list")
-    public TableDataInfo list(Customer customer) {
-        startPage();
-        List<Customer> list = customerService.selectCustomerList(customer);
-        return getDataTable(list);
+    public R list(Page<CustomerDto> page, CustomerDto customer) {
+        IPage<CustomerVo> customerDtoIPage = customerService.selectCustomerList(page, customer);
+        return R.ok(customerDtoIPage);
     }
 
     /**
@@ -41,17 +45,27 @@
      */
     @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, Customer customer) {
-        Long[] ids = customer.getIds();
-        List<Customer> list;
-        if (ids != null && ids.length > 0) {
-            list = customerService.selectCustomerListByIds(ids);
-        } else {
+    public void export(HttpServletResponse response, CustomerDto customer) {
+        ExcelUtil<CustomerVo> util = new ExcelUtil<CustomerVo>(CustomerVo.class);
+        util.exportExcel(response, customerService.selectCustomerLists(customer), "瀹㈡埛妗ｆ鏁版嵁");
+    }
 
-            list = customerService.selectCustomerList(customer);
-        }
+    @PostMapping("/downloadTemplate")
+    @Log(title = "瀹㈡埛妗ｆ-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+    public void downloadTemplate(HttpServletResponse response) {
         ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
-        util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
+        util.importTemplateExcel(response, "瀹㈡埛妗ｆ妯℃澘");
+    }
+
+
+    /**
+     * 瀵煎叆瀹㈡埛妗ｆ
+     */
+    @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, Integer type) throws Exception {
+
+        return customerService.importData(file, type);
     }
 
     /**
@@ -59,7 +73,7 @@
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(customerService.selectCustomerById(id));
+        return success(customerService.selectCustomerDetailById(id));
     }
 
     /**
@@ -97,6 +111,37 @@
      */
     @GetMapping("/customerList")
     public List customerList(Customer customer) {
-       return  customerService.customerList(customer);
+        return customerService.customerList(customer);
     }
-}
+
+
+    /**
+     * 鍒嗛厤瀹㈡埛
+     */
+    @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.OTHER)
+    @PostMapping("/assignCustomer")
+    public AjaxResult assignCustomer(@RequestBody CustomerDto customer) {
+        customerService.assignCustomer(customer);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 鍥炴敹瀹㈡埛
+     */
+    @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.OTHER)
+    @PostMapping("/recycleCustomer")
+    public AjaxResult recycleCustomer(@RequestBody CustomerDto customer) {
+        customerService.recycleCustomer(customer);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 鍏变韩瀹㈡埛
+     */
+    @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.OTHER)
+    @PostMapping("/together")
+    public AjaxResult together(@RequestBody CustomerDto customer) {
+        customerService.together(customer);
+        return AjaxResult.success();
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3