From 4275b293cfc7779a20ccea30b2f773aff0fe06db Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 13:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 3fdc4d2..f487ca1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -1,12 +1,20 @@
package com.ruoyi.basic.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+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.entity.Customer;
+import com.ruoyi.basic.service.CustomerService;
+import com.ruoyi.common.core.domain.R;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 瀹㈡埛淇℃伅 鍓嶇鎺у埗鍣�
* </p>
*
* @author ruoyi
@@ -15,7 +23,49 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/basic/customer")
+@RequestMapping("/customer")
public class CustomerController {
+ private CustomerService customerService;
+
+ /**
+ * 鏌ヨ
+ */
+ @GetMapping("/list")
+ public R<IPage<Customer>> list(Page page, CustomerDto customerDto) {
+ IPage<Customer> list = customerService.selectCustomerList(page, customerDto);
+ return R.ok(list);
+ }
+
+ /**
+ * 瀹㈡埛list
+ */
+ @GetMapping("/customerList")
+ public R<List<Customer>> list() {
+ return R.ok(customerService.customerList());
+ }
+
+ /**
+ * 瀹㈡埛鏂板淇敼
+ */
+ @PostMapping("/addOrEditCustomer")
+ public R addOrEditSupply(@RequestBody CustomerDto customerDto) {
+ return R.ok(customerService.addOrEditCustomer(customerDto));
+ }
+
+ /**
+ * 鍒犻櫎
+ */
+ @DeleteMapping("/delCustomer")
+ public R remove(@RequestBody Long[] ids) {
+ return R.ok(customerService.delCustomerByIds(ids));
+ }
+
+ /**
+ * 瀹㈡埛淇℃伅瀵煎嚭
+ */
+ @PostMapping("/export")
+ public void supplierExport(HttpServletResponse response, CustomerDto customerDto) {
+ customerService.customerExport(response, customerDto);
+ }
}
--
Gitblit v1.9.3