优化

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -64,6 +64,7 @@ name, model_id,
         repair_user_second,
         batch_no,
         register_date,
+zbh,
 refuse_reason,
 apply_time,
                                      audit_time,
@@ -149,6 +150,7 @@ sb.name,  sb.initial_value,
         sb.register_no,
         sb.character_type,
         sb.used_no,
+sb.zbh,
         sb.supplier,
         sb.repair_user_second,
         sb.batch_no,

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

@@ -406,7 +406,6 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         try {
             List<CheckStandard> items = CustomExcelImportUtil.importCheckStandardList(file.getInputStream());
             if (!CollectionUtils.isEmpty(items)) {
-
                 // 设备编号，不确定是新号还是旧号，都要判断下
                 String fileSbNo = items.get(0).getNo();
                 Weekend<SbInfo> weekend = new Weekend<>(SbInfo.class);
@@ -428,26 +427,12 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                     // 根据负责人类型查找用户,使用人员的名称查抄
                     boolean findSaveUser = false;
                     if(item.getCheckUserType() == 1){
-                        for (SbInfo info : sbInfoList) {
-                            if(info.getNo().equals(item.getNo())){
-                                item.setSbId(info.getId());
-                                item.setCheckUserId(info.getSaveUser());
-                                findSaveUser = true;
-                                break;
-                            }
-                        }
-                    } else if(item.getCheckUserType() == 2 || item.getCheckUserType() == 3){// 设备的维修员
-                        for (SbInfo info : sbInfoList) {
-                            if(info.getNo().equals(item.getNo())){
-                                item.setSbId(info.getId());
-                                item.setCheckUserId(info.getRepairUser());
-                                findSaveUser = true;
-                                break;
-                            }
-                        }
+                        item.setSbId(sbInfo.getId());
+                        item.setCheckUserId(sbInfo.getSaveUser());
                     }
-                    if(!findSaveUser){
-                        throw new BusinessException("找不到设备的使用人员或维修人员，请先设置,设备新号：" + item.getNo());
+                    if(item.getCheckUserType() == 2 || item.getCheckUserType() == 3){// 设备的维修员
+                        item.setSbId(sbInfo.getId());
+                        item.setCheckUserId(sbInfo.getRepairUser());
                     }
                     addItems.add(item);
                 }