优化

platform-rest/src/main/java/com/platform/rest/controller/check/CheckStandardController.java

@@ -201,7 +201,7 @@ public class CheckStandardController {
     public R importListByAdd( @RequestParam("files") MultipartFile[] files) throws Exception {
         String result ="";
         for(MultipartFile file: files){
-            result = result + checkStandardService.importListByAdd(file) + ",";
+            result = result + checkStandardService.importListByAdd(file);
         }
         return new R<>(result);
     }

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -408,12 +408,18 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
             if (!CollectionUtils.isEmpty(items)) {
                 // 设备编号，不确定是新号还是旧号，都要判断下
                 String fileSbNo = items.get(0).getNo();
+                Weekend<SbInfo> weekend2 = new Weekend<>(SbInfo.class);
+                WeekendCriteria<SbInfo, Object> weekendCriteria2 = weekend2.weekendCriteria();
+                weekendCriteria2.andEqualTo(SbInfo::getZbh, fileSbNo);
+                SbInfo sbInfo = sbInfoMapper.selectOneByExample(weekend2);
+                if(sbInfo == null){
                 Weekend<SbInfo> weekend = new Weekend<>(SbInfo.class);
                 WeekendCriteria<SbInfo, Object> weekendCriteria = weekend.weekendCriteria();
-                weekendCriteria.andEqualTo(SbInfo::getNo, fileSbNo).orEqualTo(SbInfo::getZbh, fileSbNo);
-                SbInfo sbInfo = sbInfoMapper.selectOneByExample(weekend);
-                if(sbInfo == null){
-                    throw new BusinessException("新号或者旧号均查不到，请确保编号正确" + ", 导入文件中的编号：" + fileSbNo);
+                weekendCriteria.andEqualTo(SbInfo::getNo, fileSbNo);
+                sbInfo = sbInfoMapper.selectOneByExample(weekend);
+                    if(sbInfo == null){
+                        throw new BusinessException("旧号查不到，新号也查不到，请确保编号正确" + ", 导入文件中的编号-" + fileSbNo);
+                    }
                 }
                 List<CheckStandard> addItems = new ArrayList<CheckStandard>();
                 List<SysUser> users = sysUserMapper.selectAll();
@@ -440,9 +446,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                     mapper.insertListforComplex(addItems);
                 }
             }
-            return "总计新增导入："+ (items.size());
+            return "成功: "  +  file.getOriginalFilename()+ ";";
         } catch (Exception e) {
-            throw new BusinessException(e.getMessage());
+            System.out.println("file.getOriginalFilename():" + file.getOriginalFilename() );
+            return ("失败:" +  file.getOriginalFilename() + ":"+ e.getMessage()+ ";");
+
         }
     }