From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 23 六月 2025 10:20:08 +0800 Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询,不显示待回款为0,默认为打钩。 销售管理】-【回款流水】,增加合同号、项目名称列查询,增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】,增加导出功能 --- src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java index 08733c7..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 = "閲囪喘鎶ヨ〃") @@ -34,8 +36,8 @@ @Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.OTHER) @GetMapping("/listVat") - public AjaxResult listVat(Page page, InvoicePurchase invoicePurchase) { - IPage<InvoicePurchase> result = invoicePurchaseService.listVat(page, invoicePurchase); + public AjaxResult listVat(Page page,String month) { + IPage<VatDto> result = invoicePurchaseService.listVat(page, month); return AjaxResult.success(result); } } -- Gitblit v1.9.3