优化

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -1020,7 +1020,7 @@ public class CustomExcelImportUtil {
         record.setNo(sbNo);// 需要根据no来判断设备的id
         record.setStandardHours("0");
         record.setEnable(1);
-        setRemark(row, record);
+        setNoRemark(row, record);
     }
 
     private static void setRemark(Row row, CheckStandard record) {
@@ -1038,6 +1038,15 @@ public class CustomExcelImportUtil {
             record.setRemark("车间");
         }
     }
+    private static void setNoRemark(Row row, CheckStandard record) {
+        if(StringUtils.isNotEmpty(row.getCell(0).getStringCellValue()) || StringUtils.isNotEmpty(row.getCell(1).getStringCellValue()) ){
+            record.setCheckUserType(1);
+            record.setRemark("车间");
+        }else{
+            record.setCheckUserType(2);
+            record.setRemark("维修");
+        }
+    }
 
     private static void setPeriod(Row row, CheckStandard record) {
      if(StringUtils.isNotBlank(row.getCell(0).getStringCellValue())){

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

@@ -384,7 +384,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                         }
                     } else if(item.getCheckUserType() == 2 || item.getCheckUserType() == 3){// 设备的维修员
                         for (SbInfo info : sbInfoList) {
-                            if(info.getNo().equals(item.getSbId())){
+                            if(info.getNo().equals(item.getNo())){
                                 item.setSbId(info.getId());
                                 item.setCheckUserId(info.getRepairUser());
                                 findSaveUser = true;
@@ -393,7 +393,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                         }
                     }
                     if(!findSaveUser){
-                        throw new BusinessException("找不到设备，请先添加,设备新号：" + item.getNo());
+                        throw new BusinessException("找不到设备的使用人员或维修人员，请先设置,设备新号：" + item.getNo());
                     }
                     addItems.add(item);
                 }