From d033b505e2904bbe5185eeffd445654bc8f1e378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Sun, 12 Oct 2025 17:20:45 +0800
Subject: [PATCH] =?UTF-8?q?10-12-=E5=90=88=E4=BD=9C=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzd/domain/vo/XzdContractAgreementVo.java |  2 ++
 .../impl/XzdContractAgreementServiceImpl.java | 36 ++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java
index bdbcdb6a..f755ce37 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java
@@ -146,5 +146,7 @@ public class XzdContractAgreementVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
     private String fileId;
 
+    private Long createBy;
+    private String createUser;
 
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAgreementServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAgreementServiceImpl.java
index 15139b6f..e3be9381 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAgreementServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAgreementServiceImpl.java
@@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.impl.SysDeptServiceImpl;
+import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.dromara.system.service.impl.SysUserServiceImpl;
 import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
 import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
@@ -25,11 +26,9 @@ import org.dromara.xzd.domain.vo.XzdContractAgreementVo;
 import org.dromara.xzd.domain.XzdContractAgreement;
 import org.dromara.xzd.mapper.XzdContractAgreementMapper;
 import org.dromara.xzd.service.IXzdContractAgreementService;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 合作协议Service业务层处理
@@ -51,6 +50,8 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
     private SysDeptServiceImpl sysDeptService;
     @Autowired
     private SysUserServiceImpl sysUserService;
+    @Autowired
+    private SysOssServiceImpl sysOssService;
 
     /**
      * 查询合作协议
@@ -139,13 +140,26 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
      * @param bo 合作协议
      * @return 是否修改成功
      */
+    @Transactional
     @Override
     public Boolean updateByBo(XzdContractAgreementBo bo) {
         XzdContractAgreement update = MapstructUtils.convert(bo, XzdContractAgreement.class);
-        validEntityBeforeSave(update);
+//        validEntityBeforeSave(update);
         //老数据
         XzdContractAgreementVo old = baseMapper.selectVoById(update.getId());
         setValue(Collections.singletonList(old));
+        //处理文件
+        List<String> oldFiles = Arrays.stream(old.getFileId().split(",")).toList();
+        List<String> newFiles = Arrays.stream(bo.getFileId().split(",")).toList();
+
+        List<Long> deleteIds = new ArrayList<>();
+
+        for (String oldFile : oldFiles) {
+            if (!newFiles.contains(oldFile)){
+                deleteIds.add(Long.valueOf(oldFile));
+            }
+        }
+        sysOssService.deleteWithValidByIds(deleteIds, false);
 
         return baseMapper.updateById(update) > 0;
     }
@@ -169,6 +183,13 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        //删除文件
+        for (Long id : ids) {
+            XzdContractAgreementVo vo = baseMapper.selectVoById(id);
+            if (vo.getFileId() != null && !vo.getFileId().isEmpty()){
+                sysOssService.deleteWithValidByIds(Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(), false);
+            }
+        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 
@@ -196,6 +217,11 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
             if (sysUserVo != null){
                 vo.setProjectManagerName(sysUserVo.getNickName());
             }
+            //录入人
+            SysUserVo sysUserVo1 = sysUserService.selectUserById(vo.getCreateBy());
+            if (sysUserVo1 != null){
+                vo.setCreateUser(sysUserVo1.getUserName());
+            }
         }
     }