From 1e23919f4601bcb51e3aae6c61611c7e48f14b35 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Wed, 22 Mar 2023 10:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 6242ec88..af3a0f36 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2043,6 +2043,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }
         //将文件写入到指定路径中
         FileUtils.copyInputStreamToFile(file.getInputStream(),new File(path + "/" + fileNameStr));
+        int countSuccess = 0;
         try {
             //解压缩
             String zipEntryName = FileUnZip.unZipFiles(path + "/" + fileNameStr, path);
@@ -2233,21 +2234,23 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
 
                                         String qtwjbuss = rowList.get("附件");
-                                        String[] split = qtwjbuss.split(",");
-                                        String s = "";
-                                        if (split.length != 0){
-                                            for (int j = 0;j < split.length;j++){
-                                                String name = fileInfo.getName();
-                                                String[] split1 = fileInfo.toString().split(name);
-                                                File files = new File(split1[0]+split[j]);
-                                                AttFileVo attFileVo = attFileEOService.saveFileInfo(files);
-                                                if (StringUtils.isNotBlank(attFileVo.getId())){
-                                                    s += "," + attFileVo.getAttId();
-                                                }else {
-                                                    s = attFileVo.getAttId();
+                                        if (qtwjbuss != null && !qtwjbuss.equals("")) {
+                                            String[] split = qtwjbuss.split(",");
+                                            String s = "";
+                                            if (split.length != 0) {
+                                                for (int j = 0; j < split.length; j++) {
+                                                    String name = fileInfo.getName();
+                                                    String[] split1 = fileInfo.toString().split(name);
+                                                    File files = new File(split1[0] + split[j]);
+                                                    AttFileVo attFileVo = attFileEOService.saveFileInfo(files);
+                                                    if (StringUtils.isNotBlank(attFileVo.getId())) {
+                                                        s += "," + attFileVo.getAttId();
+                                                    } else {
+                                                        s = attFileVo.getAttId();
+                                                    }
                                                 }
+                                                sarBussStandAttrInfo.setQtwjbuss(s);
                                             }
-                                            sarBussStandAttrInfo.setQtwjbuss(s);
                                         }
 
                                         String standSort = rowList.get("企标类型");
@@ -2278,6 +2281,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
                                         //入库
                                         processCreateBuss(infoJson);
+                                        countSuccess++;
                                     }
                                 }
                             }
@@ -2297,11 +2301,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                 }
             }
         }
+            String msg = "成功导入" + countSuccess + "条";
+            return Result.success("",msg,null);
         }catch (Exception e){
             FileUnZip.deleteDir(saveDirectory);
             return Result.error("导入失败,没有可导入的数据,请检查!");
         }
-        return Result.success("","导入完成",true);
     }
 
     private static List<File> readImpExcelFile(String path) {