Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

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,6 +2234,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
 
                                         String qtwjbuss = rowList.get("附件");
+                                        if (qtwjbuss != null && !qtwjbuss.equals("")) {
                                             String[] split = qtwjbuss.split(",");
                                             String s = "";
                                             if (split.length != 0) {
@@ -2249,6 +2251,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 }
                                                 sarBussStandAttrInfo.setQtwjbuss(s);
                                             }
+                                        }
 
                                         String standSort = rowList.get("企标类型");
                                         if (StringUtils.isNotBlank(standSort)){
@@ -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) {