From 3c83bac9f2f447b6f1c77fa53d9df9e7c20d6041 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 18 四月 2026 10:38:06 +0800
Subject: [PATCH] feat: 退货台账客户列表返回已发货客户
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 94c4007..e5dc224 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.dto.CustomerImportDto;
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<Customer> page, Customer customer) {
+ public IPage<CustomerDto> list(Page<Customer> page, Customer customer) {
return customerService.selectCustomerList(page, customer);
}
@@ -49,14 +51,14 @@
} else {
list = customerService.selectCustomerLists(customer);
}
- ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ ExcelUtil<Customer> util = new ExcelUtil<>(Customer.class);
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
}
@PostMapping("/downloadTemplate")
@Log(title = "瀹㈡埛妗ｆ-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
public void downloadTemplate(HttpServletResponse response) {
- ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ ExcelUtil<CustomerImportDto> util = new ExcelUtil<>(CustomerImportDto.class);
util.importTemplateExcel(response, "瀹㈡埛妗ｆ妯℃澘");
}
@@ -67,8 +69,8 @@
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
-
- return customerService.importData(file);
+ customerService.importData(file);
+ return AjaxResult.success();
}
/**
@@ -116,4 +118,5 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
}
--
Gitblit v1.9.3