Merge remote-tracking branch 'origin/master'

yaowanxin

2 天以前 e83d4cecece6e8677392229e996dea22bbe2d1e9

 src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java

@@ -6,12 +6,14 @@
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.enums.FileNameType;
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;
@@ -87,7 +89,7 @@
        // 批量查询这些发票关联的文件信息
        LambdaQueryWrapper<CommonFile> fileQueryWrapper = new LambdaQueryWrapper<>();
        fileQueryWrapper.in(CommonFile::getCommonId, invoiceIds)
                .eq(CommonFile::getType,"3");
                .eq(CommonFile::getType, FileNameType.INVOICE.getValue());
        List<CommonFile> fileList = commonFileMapper.selectList(fileQueryWrapper);

        // 将文件信息映射到对应的发票ID
@@ -151,7 +153,7 @@
        // 查询上传文件
        LambdaQueryWrapper<CommonFile> commonFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
        commonFileLambdaQueryWrapper.eq(CommonFile::getCommonId, invoicePurchaseDto.getId())
                .eq(CommonFile::getType, "3");
                .eq(CommonFile::getType, FileNameType.INVOICE.getValue());
        List<CommonFile> commonFiles = commonFileMapper.selectList(commonFileLambdaQueryWrapper);
        resultDto.setCommonFiles(commonFiles);
        return resultDto;
@@ -167,4 +169,13 @@

        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;
    }
}