From dac03b5ff8efb1b733d37dce7553ed0aff32c780 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 09 五月 2025 17:47:02 +0800
Subject: [PATCH] 1.销售台账合同金额（所有产品含税总价）
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 3f325b1..1c934a1 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -11,7 +11,6 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -38,10 +37,10 @@
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@GetMapping("/list")
- public TableDataInfo list(SalesLedger salesLedger)
+ public TableDataInfo list(SalesLedgerDto salesLedgerDto)
{
startPage();
- List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+ List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
return getDataTable(list);
}
@@ -49,11 +48,8 @@
* 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
*/
@GetMapping("/getSalesLedgerWithProducts")
- public TableDataInfo getSalesLedgerWithProducts()
- {
- startPage();
- List<SalesLedgerDto> list = salesLedgerService.getSalesLedgerWithProducts();
- return getDataTable(list);
+ public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto){
+ return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
}
/**
@@ -61,20 +57,11 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SalesLedger salesLedger)
+ public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto)
{
- List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+ List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
- }
-
- /**
- * 鑾峰彇閿�鍞彴璐﹁缁嗕俊鎭�
- */
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(salesLedgerService.selectSalesLedgerById(id));
}
/**
--
Gitblit v1.9.3