From 47e44d7ff2aacf785e765b59a73e7c74ae19a170 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Fri, 14 Jun 2024 19:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GetInformationForExcelServiceImpl.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index 0b2d00cd..354effa5 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -99,8 +99,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                         deleteFile.add(folderFiler + "\\" + file1.getName());
                         imageFiles.add(folderFiler + "\\" + renamedFile.getName());
                     } else {
-                        deleteFile.add(folderFiler + "\\" + file1.getName());
-                        excelFiles.add(renamedFile);
+                        excelFiles.add(file1);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -161,7 +160,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             if (CollectionUtils.isNotEmpty(equipmentDataDetails)) {
                 //批量新增
                 getInformationForExcelMapper.saveByExcels(equipmentDataDetails);
-                for (String s : deleteFile) {
+                for (String s : fileName) {
                     deleteBypath(s, excel.getBackupFolderPath());
                 }
             } else {
@@ -173,7 +172,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             List<EquipmentDataDetail> equipmentDataDetails = saveTxt(tffName, excel, batchNo);
             //新增数据
             saveInformation(equipmentDataDetails);
-            for (String s : deleteFile) {
+            for (String s : tffName) {
                 deleteBypath(s, excel.getBackupFolderPath());
             }
         }
@@ -181,7 +180,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
         if (CollectionUtils.isNotEmpty(txtName)) {
             List<EquipmentDataDetail> equipmentDataDetails1 = saveTxtFile(txtName, excel, batchNo);
             saveInformation(equipmentDataDetails1);
-            for (String s : deleteFile) {
+            for (String s : txtName) {
                 deleteBypath(s, excel.getBackupFolderPath());
             }
         }