From ec6bb00c62a09c6e84e535795965b1f19bd95b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 29 Mar 2023 19:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OtaBaCxAqcsServiceImpl.java  |  2 +-
 .../impl/OtaBaCxKsjjsmccsServiceImpl.java     | 41 +++++++++++++++----
 .../impl/OtaBaCxZxsjyqServiceImpl.java        |  2 +-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
index c7420a449..aa786c249 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
@@ -106,7 +106,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
             }
             for (String oId : oldAttMap.keySet()) {
                 if (!newAttMap.containsKey(oId)) {
-                    reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(oId)));
+                    reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", oldAttMap.get(oId)));
                 }
             }
             otaBaCxTxjlService.saveBatch(reList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
index 6b68cc0d4..a1fc4e36c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
@@ -18,7 +18,7 @@ import com.jero.modules.ota.service.IOtaBaCxTxjlService;
 import com.jero.modules.ota.utils.ComparisonUtil;
 import com.jero.modules.ota.utils.ImportFileUtil;
 import com.jero.modules.system.service.ISysDictService;
-import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -111,15 +111,42 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
             ComparisonUtil cu = new ComparisonUtil();
             List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService);
             saveOrUpdateBatch(newList);
-            otaBaCxTxjlService.saveBatch(reList);
             String fj = (String) json.get("fj");
+            OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
+            String oldFjStr = otaBaCxList.getZxsjjsfj();
+            otaBaCxList.setZxsjjsfj(fj);
+            otaBaCxListService.editById(otaBaCxList);
+            String[] newFjList = {};
             if (StringUtils.isNotEmpty(fj)) {
-                OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
-                if (ObjectUtils.isNotEmpty(otaBaCxList)) {
-                    otaBaCxList.setZxsjjsfj(fj);
-                    otaBaCxListService.editById(otaBaCxList);
+                newFjList = fj.split(",");
+            }
+            for (String nf : newFjList) {
+                if (StringUtils.isEmpty(oldFjStr) || !oldFjStr.contains(nf)) {
+                    List<OSSFile> fileList = ossFileService.getFileInfos(nf);
+                    if (ObjectUtils.isNotEmpty(fileList)) {
+                        for (OSSFile f : fileList) {
+                            reList.add(cu.addAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName()));
+                        }
+                    }
                 }
             }
+            String[] oldFjList = {};
+            if (StringUtils.isNotEmpty(oldFjStr)) {
+                oldFjList = oldFjStr.split(",");
+            }
+            for (String of : oldFjList) {
+                if (StringUtils.isEmpty(fj) || !fj.contains(of)) {
+                    List<OSSFile> fileList = ossFileService.getFileInfos(of);
+                    if (ObjectUtils.isNotEmpty(fileList)) {
+                        for (OSSFile f : fileList) {
+                            reList.add(cu.delAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName()));
+                        }
+                    }
+                }
+            }
+
+
+            otaBaCxTxjlService.saveBatch(reList);
         }
     }
 
@@ -195,7 +222,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
     }
 
     private List<OtaBaCxKsjjsmccs> getByOtaId(String otaId) {
-        if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){
+        if (StringUtils.isEmpty(otaId)) {
             return null;
         }
         LambdaQueryWrapper<OtaBaCxKsjjsmccs> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
index 3a84bef71..3abfdc679 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
@@ -111,7 +111,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
         }
         for (String oId : oldAttMap.keySet()) {
             if (!newAttMap.containsKey(oId)) {
-                reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(oId)));
+                reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", oldAttMap.get(oId)));
             }
         }
         otaBaCxTxjlService.saveBatch(reList);