优化保养标准

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

@@ -607,13 +607,14 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
     private void packageSbInfoAndCheckStandard(SbInfo sbInfo, ExportCheckStandardVO2 vo, CheckStandard checkStandard) {
         if ("使用人".equals(vo.getCheckUserType().trim())) {
             checkStandard.setCheckUserType(1);
-        } else if ("维修人".equals(vo.getCheckUserType())) {
+        } else if ("维修人".equals(vo.getCheckUserType().trim())) {
             checkStandard.setCheckUserType(2);
-        } else if ("厂家".equals(vo.getCheckUserType())) {
+        } else if ("厂家".equals(vo.getCheckUserType().trim())) {
             checkStandard.setCheckUserType(3);
         }else{
             checkStandard.setCheckUserType(2);
         }
+
         if (StringUtils.isNotBlank(vo.getLastDate())) {
             checkStandard.setLastDate(LocalDate.parse(vo.getLastDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         }
@@ -636,10 +637,12 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
 
         if (checkStandard.getCheckUserType() == 1) {
             checkStandard.setSbId(sbInfo.getId());
+            checkStandard.setLevel(CheckStandardLevelEnum.A.getValue());
             checkStandard.setCheckUserId(sbInfo.getSaveUser());
         }
         if (checkStandard.getCheckUserType() == 2 || checkStandard.getCheckUserType() == 3) {// 设备的维修员
             checkStandard.setSbId(sbInfo.getId());
+            checkStandard.setLevel(CheckStandardLevelEnum.B.getValue());
             checkStandard.setCheckUserId(sbInfo.getRepairUser());
         }
     }
@@ -666,33 +669,35 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
             }
         }
 
+        SbInfo sbInfo = BeanConverterUtil.copyObjectProperties(sbInfoMapper.getByNo(sbNoList.get(0)), SbInfo.class);
+
         //查询所有的保养任务标准id
-        List<CheckStandard> standards = mapper.select(null);
+        CheckStandard search = new CheckStandard();
+        search.setSbId(sbInfo.getId());
+        List<CheckStandard> standards = mapper.select(search);
         StringBuffer sb = new StringBuffer();
         for (CheckStandard standard : standards) {
             sb.append(standard.getId()).append(",");
         }
-        String idStr = sb.toString();
-//        List<CheckStandard> list = CustomExcelImportUtil.importCheckStandardList(file.getInputStream());
-        String sbId = null;
-        SbInfo sbInfo = new SbInfo();
-        CheckStandard checkStandard;
+
         List<CheckStandard> updates = new ArrayList<>();
         List<CheckStandard> adds = new ArrayList<>();
         List<CheckStandard> deletes = new ArrayList<>();
         for (ExportCheckStandardVO2 vo : list) {
-            checkStandard = new CheckStandard();
+            CheckStandard checkStandard = new CheckStandard();
             checkStandard.setPeriodType(DictCache.getValueByLabel("PERIOD_TYPE", vo.getPeriodType()));
-            if (StringUtils.isNotBlank(vo.getId())) {
-                //修改
-                checkStandard.setId(vo.getId());
-                packageSbInfoAndCheckStandard(sbInfo, vo, checkStandard);
-                updates.add(checkStandard);
-            } else {
+            if (StringUtils.isNotBlank(vo.getId()) && vo.getId().trim().equals("新增")) {
                 //新增
                 packageSbInfoAndCheckStandard(sbInfo, vo, checkStandard);
                 checkStandard.setId(IdGeneratorUtils.getObjectId());
+                checkStandard.setType(2);
+                checkStandard.setEnable(1);
                 adds.add(checkStandard);
+            } else {
+                //修改
+                checkStandard.setId(vo.getId());
+                packageSbInfoAndCheckStandard(sbInfo, vo, checkStandard);
+                updates.add(checkStandard);
             }
         }
         for (CheckStandard standard : standards) {