From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..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 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();
}
/**
@@ -76,7 +78,7 @@
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(customerService.selectCustomerById(id));
+ return success(customerService.selectCustomerDetailById(id));
}
/**
@@ -116,4 +118,5 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
}
--
Gitblit v1.9.3