From 1163e4b9013274aeb57562fbd9346be1db3299d9 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 22 四月 2026 17:27:51 +0800
Subject: [PATCH] 修改捐献上报基础ID未保存

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
index 16d8ac0..f152a2e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
@@ -59,13 +59,14 @@
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName) {
+    public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName,Long reportId) {
         boolean save = false;
         if (CollectionUtils.isNotEmpty(serviceDonatebaseinfoReportFiles)) {
             for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
                 serviceDonatebaseinfoReportFile.setCreateTime(new Date());
                 serviceDonatebaseinfoReportFile.setCreateBy(createName);
                 serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
+                serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(reportId);
                 serviceDonatebaseinfoReportFile.setCreateTime(new Date());
                 save = save(serviceDonatebaseinfoReportFile);
             }
@@ -89,12 +90,12 @@
 
         // 鏍囪闇�瑕佸垹闄ょ殑璁板綍锛堝瓨鍦ㄤ簬鏁版嵁搴撲絾涓嶅湪鏂板垪琛ㄤ腑锛�
         for (ServiceDonatebaseinfoReportFile file : list) {
-            if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
+            //if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
                 file.setDelFlag(1);
                 file.setUpdateTime(new Date());
                 file.setUpdateBy(updateName);
                 result &= updateById(file);
-            }
+           // }
         }
 
         // 娣诲姞鏂扮殑璁板綍
@@ -103,6 +104,7 @@
                 serviceDonatebaseinfoReportFile.setUpdateBy(updateName);
                 serviceDonatebaseinfoReportFile.setUpdateTime(new Date());
                 serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
+                serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(reportId);
                 result &= save(serviceDonatebaseinfoReportFile);
             }
         }

--
Gitblit v1.9.3