From af73f49872f899a1cb301ae6e3ee23ebc28daf20 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 17:15:07 +0800
Subject: [PATCH] 2025-06-23 设备台账接口对接完成
---
src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
index 6d4728d..cc8bb73 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.purchase.dto.InvoicePurchaseReportDto;
+import com.ruoyi.purchase.dto.VatDto;
import com.ruoyi.purchase.mapper.InvoicePurchaseMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.InvoicePurchase;
@@ -169,8 +170,11 @@
}
@Override
- public IPage<InvoicePurchase> listVat(Page page, InvoicePurchase invoicePurchase) {
- invoicePurchaseMapper.listVat(page, invoicePurchase);
- return null;
+ public IPage<VatDto> listVat(Page page, String month) {
+ IPage<VatDto> vatDtos = invoicePurchaseMapper.listVat(page,month);
+ vatDtos.getRecords().forEach(vatDto -> {
+ vatDto.setTaxAmount(vatDto.getJTaxAmount().subtract(vatDto.getXTaxAmount()));
+ });
+ return vatDtos;
}
}
--
Gitblit v1.9.3