From d086ecc4ce42fca3d80e29bab1f203df13831113 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 11:07:26 +0800
Subject: [PATCH] fix: 编辑/新增销售台账产品信息数据展示缺失
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 833aa97..033c5ec 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -2,6 +2,7 @@
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.common.utils.poi.ExcelUtil;
@@ -32,7 +33,7 @@
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
@GetMapping("/list")
- public IPage<Customer> list(Page page, Customer customer) {
+ public IPage<CustomerDto> list(Page<Customer> page, Customer customer) {
return customerService.selectCustomerList(page, customer);
}
@@ -53,6 +54,13 @@
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
}
+ @PostMapping("/downloadTemplate")
+ @Log(title = "瀹㈡埛妗ｆ-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ util.importTemplateExcel(response, "瀹㈡埛妗ｆ妯℃澘");
+ }
+
/**
* 瀵煎叆瀹㈡埛妗ｆ
@@ -61,7 +69,7 @@
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
- return success(customerService.importData(file));
+ return customerService.importData(file);
}
/**
@@ -69,7 +77,7 @@
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(customerService.selectCustomerById(id));
+ return success(customerService.selectCustomerDetailById(id));
}
/**
@@ -109,4 +117,5 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
}
--
Gitblit v1.9.3