From e8304b5b39787b25eb024fafd00d7db512ee6438 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 19 五月 2025 09:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index a42414b..99a3ea2 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -76,14 +76,14 @@
}
/**
- * 闄勪欢涓嬭浇
+ * 寮�绁ㄥ彴璐﹀鍑�
* @param response
* @param invoiceLedgerDto
* @return
*/
- @GetMapping("/downloadFile")
- public void invoiceLedgerDownloadFile(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
- invoiceLedgerService.invoiceLedgerDownload(response, invoiceLedgerDto);
+ @PostMapping("/export")
+ public void invoiceLedgerExport(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
+ invoiceLedgerService.invoiceLedgerExport(response, invoiceLedgerDto);
}
/**
@@ -96,4 +96,40 @@
return AjaxResult.success(invoiceLedgerService.invoiceLedgerDetail(id));
}
+ /**
+ * 鏂囦欢鎻愪氦
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @PostMapping("/commitFile")
+ public AjaxResult invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
+ try {
+ invoiceLedgerService.invoiceLedgerCommitFile(invoiceLedgerDto);
+ return AjaxResult.success();
+ }catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 寮�绁ㄥ彴璐︽煡璇�
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @GetMapping("/list")
+ public AjaxResult invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
+ }
+
+ /**
+ * 瀹㈡埛閿�鍞褰�
+ * @param page
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @GetMapping("/salesAccount")
+ public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
+ }
+
}
--
Gitblit v1.9.3