From 05b430789fa8b375acc6e4d4abd98f89c430e3a7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 九月 2025 10:05:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index 50367c9..5f62c97 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.purchase.dto.InvoicePurchaseReportDto;
+import com.ruoyi.purchase.dto.VatDto;
import com.ruoyi.purchase.pojo.InvoicePurchase;
import com.ruoyi.purchase.service.IInvoicePurchaseService;
import io.swagger.annotations.Api;
@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
@RestController
@Api(tags = "閲囪喘鎶ヨ〃")
@@ -26,9 +28,16 @@
private IInvoicePurchaseService invoicePurchaseService;
@GetMapping("/list")
- @Log(title = "閲囪喘鎶ヨ〃", businessType = BusinessType.OTHER)
+ @Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎", businessType = BusinessType.OTHER)
public AjaxResult list(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
IPage<InvoicePurchaseReportDto> result =invoicePurchaseService.listPurchaseReport(page, invoicePurchaseReportDto);
return AjaxResult.success(result);
}
+
+ @Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.OTHER)
+ @GetMapping("/listVat")
+ public AjaxResult listVat(Page page,String month) {
+ IPage<VatDto> result = invoicePurchaseService.listVat(page, month);
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3