From 4ad511de7896309b113154773d823f5a1361c2d8 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 27 Jul 2021 09:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E8=AE=A1=E5=88=92=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/service/impl/ResourceInspectPlanServiceImpl.java    | 2 +-
 .../equip/service/impl/ResourceInspectTaskServiceImpl.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
index f5a28dbf..e672cf6e 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
+++ b/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));
         }
         // 创建人员、创建时间；修改人员、修改时间
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
index a518b5dd..e2e9f2c7 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
+++ b/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;
                 }
             }