From 9f3689ea26fd2158ffafd31a7932b1e685b0252b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 二月 2026 11:59:46 +0800
Subject: [PATCH] fix: 一个合同中多个产品时，来票登记已来票金额、待来票金额统计有误
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 14fe835..2aa03b2 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -166,6 +166,20 @@
.eq(CommonFile::getCommonId, record.getId())
.eq(CommonFile::getType, FileNameType.ApproveProcess.getValue()));
record.setCommonFileList(commonFiles);
+ // 閲囪喘瀹℃壒鏌ヨ閲囪喘闄勪欢
+ if (approveProcess.getApproveType() == 5) {
+ List<CommonFile> commonFiles1 = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getId())
+ .eq(CommonFile::getType, FileNameType.PURCHASE.getValue()));
+ record.setCommonFileList(commonFiles1);
+ }
+ // 鍙戣揣瀹℃壒鏌ヨ鍙戣揣闄勪欢
+ if (approveProcess.getApproveType() == 7) {
+ List<CommonFile> commonFiles1 = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getId())
+ .eq(CommonFile::getType, FileNameType.SHIP.getValue()));
+ record.setCommonFileList(commonFiles1);
+ }
}
return approveProcessIPage;
}
--
Gitblit v1.9.3