From 533d543c55aeb903c6da281ee06cbfac80d9decc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 17:40:50 +0800
Subject: [PATCH] fix: 去除人员汇总接口
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index e89e203..008c92d 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -2,6 +2,8 @@
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.excel.CustomerExcelDTO;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -32,7 +34,7 @@
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
@GetMapping("/list")
- public IPage<Customer> list(Page page, Customer customer) {
+ public IPage<Customer> list(Page<Customer> page, Customer customer) {
return customerService.selectCustomerList(page, customer);
}
@@ -51,6 +53,23 @@
}
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
+ }
+
+ /**
+ * 瀵煎嚭瀹㈡埛璺熻繘璁板綍
+ */
+ @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportFollowUpList")
+ public void exportFollowUpList(HttpServletResponse response, Customer customer) {
+ Long[] ids = customer.getIds();
+ List<CustomerExcelDTO> list;
+ if (ids != null && ids.length > 0) {
+ list = customerService.selectCustomerDtoByIds(ids);
+ } else {
+ list = customerService.selectCustomerDtoLists();
+ }
+ ExcelUtil<CustomerExcelDTO> util = new ExcelUtil<CustomerExcelDTO>(CustomerExcelDTO.class);
+ util.exportExcel(response, list, "瀹㈡埛璺熻繘璁板綍");
}
@PostMapping("/downloadTemplate")
@@ -76,7 +95,7 @@
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(customerService.selectCustomerById(id));
+ return success(customerService.selectCustomerDetailById(id));
}
/**
@@ -116,4 +135,13 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
+ /**
+ * 杞Щ瀹㈡埛
+ */
+ @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.UPDATE)
+ @PatchMapping("/transferCustomer")
+ public AjaxResult transferCustomer(@RequestBody CustomerDto customerDto) {
+ return toAjax(customerService.transferCustomer(customerDto));
+ }
}
--
Gitblit v1.9.3