From 6ed42390d7231b0d26700898ee2922732043effa Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 19 六月 2025 16:20:34 +0800
Subject: [PATCH] 2025-06-19 增值税对比 + 问题修改
---
src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 ee93b39..cc8bb73 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.project.system.domain.SysUser;
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;
@@ -158,4 +162,19 @@
public List<InvoicePurchase> selectInvoicePurchaseLists(InvoicePurchase invoicePurchase) {
return invoicePurchaseMapper.selectList(new LambdaQueryWrapper<>());
}
+
+ @Override
+ public IPage<InvoicePurchaseReportDto> listPurchaseReport(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
+
+ return invoicePurchaseMapper.selectPurchaseReport(page, invoicePurchaseReportDto);
+ }
+
+ @Override
+ 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