From af9eeec3590806f1e699511be33c892721defc49 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 09:26:28 +0800
Subject: [PATCH] 捐献确认基本信息集合协调员2字段错
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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..79a46d9 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,20 +90,24 @@
// 鏍囪闇�瑕佸垹闄ょ殑璁板綍锛堝瓨鍦ㄤ簬鏁版嵁搴撲絾涓嶅湪鏂板垪琛ㄤ腑锛�
for (ServiceDonatebaseinfoReportFile file : list) {
- if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
- file.setDelFlag(1);
- file.setUpdateTime(new Date());
- file.setUpdateBy(updateName);
- result &= updateById(file);
- }
+ //if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
+// file.setDelFlag(1);
+// file.setUpdateTime(new Date());
+// file.setUpdateBy(updateName);
+// result &= updateById(file);
+ this.baseMapper.deleteById(file.getId());
+
+ // }
}
// 娣诲姞鏂扮殑璁板綍
for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
- if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) && !existingPaths.contains(serviceDonatebaseinfoReportFile.getFileName().trim())) {
+ if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) ) {
+ serviceDonatebaseinfoReportFile.setId(null);
serviceDonatebaseinfoReportFile.setUpdateBy(updateName);
serviceDonatebaseinfoReportFile.setUpdateTime(new Date());
serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
+ serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(reportId);
result &= save(serviceDonatebaseinfoReportFile);
}
}
--
Gitblit v1.9.3