点检计划模块更新

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java

@@ -450,7 +450,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
         }else {
             inspectTask.setPlanStartDate(taskCreateDate.minusDays(beforeTolerance));
         }
-        if (!(afterTolerance < 0 || afterTolerance == null)){
+        if (!(afterTolerance == null || afterTolerance < 0 )){
             inspectTask.setPlanCompleteDate(taskCreateDate.plusDays(afterTolerance));
         }
         // 创建人员、创建时间；修改人员、修改时间

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java

@@ -189,10 +189,10 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         task.setModifiedDateTime(LocalDateTime.now());
         // 若状态为完成，则获取检验结果
         if ( status.equals(Constants.INSPECTION_TASK_STATUS_COMPLETE) ){
-            task.setResult("Y");
+            task.setResult("OK");
             for (ResourceInspectTaskParam taskParam:taskItemDetailList) {
                 if (taskParam.getResult().equals("N")){
-                    task.setResult("N");
+                    task.setResult("NG");
                     break;
                 }
             }