From 8611fa1fb659af4b9c4f894926ceb273b978a133 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 30 六月 2026 15:59:34 +0800
Subject: [PATCH] 供者转运登记作废状态异常处理

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
index 09e782c..cdf6b30 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
@@ -77,9 +77,9 @@
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long reportId,String caseNo,String updateName) {
+    public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long transportId,String caseNo,String updateName) {
         // 鍏堝皢鏁版嵁鏌ュ嚭鏉�
-        List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, reportId));
+        List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, transportId));
 
         // 鎻愬彇鐜版湁璁板綍鐨勮矾寰勯泦鍚堬紝鐢ㄤ簬楂樻晥姣旇緝
         Set<String> existingPaths = list.stream().map(file -> file.getFileName() != null ? file.getPath().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());
@@ -91,11 +91,12 @@
 
         // 鏍囪闇�瑕佸垹闄ょ殑璁板綍锛堝瓨鍦ㄤ簬鏁版嵁搴撲絾涓嶅湪鏂板垪琛ㄤ腑锛�
         for (ServiceTransportFile file : list) {
-            if (StringUtils.isNotEmpty(file.getFileName()) && !newPathSet.contains(file.getFileName().trim())) {
-                file.setDelFlag(1);
-                file.setUpdateTime(new Date());
-                file.setUpdateBy(updateName);
-                result &= updateById(file);
+            if (StringUtils.isNotEmpty(file.getFileName()) && newPathSet.contains(file.getFileName().trim())) {
+//                file.setDelFlag(1);
+//                file.setUpdateTime(new Date());
+//                file.setUpdateBy(updateName);
+                removeById(file.getId());
+                //result &= updateById(file);
             }
         }
 
@@ -103,7 +104,7 @@
         for (ServiceTransportFile serviceTransportFile : annexfilesList) {
             if (StringUtils.isNotEmpty(serviceTransportFile.getFileName()) && !existingPaths.contains(serviceTransportFile.getFileName().trim())) {
                 serviceTransportFile.setId(null);
-                serviceTransportFile.setTransportId(reportId);
+                serviceTransportFile.setTransportId(transportId);
                 serviceTransportFile.setCreateBy(updateName);
                 serviceTransportFile.setUpdateTime(new Date());
                 result &= save(serviceTransportFile);

--
Gitblit v1.9.3