From e9f2adb9ddc511c62e1628fbd527ba7cda8294d4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 09 五月 2025 14:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after

---
 src/main/java/com/ruoyi/basic/controller/CustomerController.java |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 1a81652..cc94893 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -8,7 +8,6 @@
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,23 +22,21 @@
 
 /**
  * 瀹㈡埛妗ｆController
- * 
+ *
  * @author ruoyi
  * @date 2025-05-07
  */
 @RestController
-@RequestMapping("/system/customer")
+@RequestMapping("/basic/customer")
 @AllArgsConstructor
-public class CustomerController extends BaseController
-{
+public class CustomerController extends BaseController {
     private ICustomerService customerService;
 
     /**
      * 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
      */
     @GetMapping("/list")
-    public TableDataInfo list(Customer customer)
-    {
+    public TableDataInfo list(Customer customer) {
         startPage();
         List<Customer> list = customerService.selectCustomerList(customer);
         return getDataTable(list);
@@ -50,9 +47,15 @@
      */
     @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, Customer customer)
-    {
-        List<Customer> list = customerService.selectCustomerList(customer);
+    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 {
+
+            list = customerService.selectCustomerList(customer);
+        }
         ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
         util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
     }
@@ -61,8 +64,7 @@
      * 鑾峰彇瀹㈡埛妗ｆ璇︾粏淇℃伅
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(customerService.selectCustomerById(id));
     }
 
@@ -70,9 +72,8 @@
      * 鏂板瀹㈡埛妗ｆ
      */
     @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.INSERT)
-    @PostMapping  ("/addCustomer")
-    public AjaxResult add(@RequestBody Customer customer)
-    {
+    @PostMapping("/addCustomer")
+    public AjaxResult add(@RequestBody Customer customer) {
         return toAjax(customerService.insertCustomer(customer));
     }
 
@@ -80,9 +81,8 @@
      * 淇敼瀹㈡埛妗ｆ
      */
     @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody Customer customer)
-    {
+    @PostMapping("/updateCustomer")
+    public AjaxResult edit(@RequestBody Customer customer) {
         return toAjax(customerService.updateCustomer(customer));
     }
 
@@ -90,9 +90,19 @@
      * 鍒犻櫎瀹㈡埛妗ｆ
      */
     @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/delCustomer")
+    public AjaxResult remove(@RequestBody Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+        }
         return toAjax(customerService.deleteCustomerByIds(ids));
     }
+
+    /**
+     * 鏌ヨ瀹㈡埛
+     */
+    @GetMapping("/customerList")
+    public List customerList(Customer customer) {
+       return  customerService.customerList(customer);
+    }
 }

--
Gitblit v1.9.3