From bf4d437a2596aa8a50cc4910c59bbbd418427557 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 11 十月 2025 09:53:51 +0800
Subject: [PATCH] 财务管理与销售采购模块数据联动
---
src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java | 7 ++++---
1 files changed, 4 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 cc8bb73..0187823 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
@@ -6,6 +6,7 @@
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;
@@ -88,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);
// 灏嗘枃浠朵俊鎭槧灏勫埌瀵瑰簲鐨勫彂绁↖D
@@ -152,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;
@@ -165,7 +166,7 @@
@Override
public IPage<InvoicePurchaseReportDto> listPurchaseReport(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
-
+ // 澧炲�肩◣ = 閿�鍞殑锛堝惈绋庢�讳环-涓嶅惈绋庢�讳环锛夊噺鍘婚噰璐殑锛堝惈绋庢�讳环-涓嶅惈绋庢�讳环锛�
return invoicePurchaseMapper.selectPurchaseReport(page, invoicePurchaseReportDto);
}
--
Gitblit v1.9.3