From 0259c406eb3e01064c6df36cf55d9cd698f938d6 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Fri, 10 Sep 2021 16:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=BD=93=E6=97=A5=E6=9C=89=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E7=82=B9=E6=A3=80=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E5=88=9B=E5=BB=BA=E6=96=B0=E7=9A=84=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResourceRepairTaskServiceImpl.java   | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index b4d7bc97..4fcda511 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
@@ -241,9 +241,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription());
                 repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription());
                 // 修改设备状态：判断维修前和维修结束的stopMachie字段是否修改
-                String stopMachine = resourceRepairTask.getStopMachine();
+                /*String stopMachine = resourceRepairTask.getStopMachine();
                 String stopMachineT = repairTask.getStopMachine();
-                /*if (!stopMachine.equals(stopMachineT)){
+                if (!stopMachine.equals(stopMachineT)){
                     String resourceNo = repairTask.getResourceNo();
                     resrceService.updateResourceStatus(site, resourceNo, stopMachineT.equals("N")?"301":"5");
                 }*/
@@ -259,27 +259,36 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 resourceInspectTask.setPlanCompleteDate(endDate);
                 resourceInspectTask.setResrce(resourceRepairTask.getResourceNo());
                 List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask);
+                Boolean bl = true;
                 for (ResourceInspectTask inspectTask:inspectTaskList) {
-                    // 查询到点检结果为NG的设备，创建新的当日点检任务
-                    if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
-                        String taskNo = inspectTask.getTaskNo();
-                        String taskStr = taskNo+now;
-                        inspectTask.setTaskNo(taskStr);
-                        inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,taskStr));
-                        inspectTask.setResult("");
-                        inspectTask.setActualCompleteDate(null);
-                        inspectTask.setExecutor("");
-                        inspectTask.setCreatedDateTime(now);
-                        inspectTask.setTaskCreateDate(now);
-                        inspectTask.setPlanStartDate(now);
-                        inspectTask.setActualStartDate(null);
-                        inspectTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
-                        inspectTask.setModifyUser(null);
-                        inspectTask.setModifiedDateTime(null);
-                        resourceInspectTaskMapper.insert(inspectTask);
+                    if (Constants.RSESULT_OK.equals(inspectTask.getResult())){
+                        bl = false;
                         break;
                     }
                 }
+                if (bl){
+                    for (ResourceInspectTask inspectTask:inspectTaskList) {
+                        // 查询到点检结果为NG的设备，创建新的当日点检任务
+                        if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
+                            String taskNo = inspectTask.getTaskNo();
+                            String taskStr = taskNo+now;
+                            inspectTask.setTaskNo(taskStr);
+                            inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,taskStr));
+                            inspectTask.setResult("");
+                            inspectTask.setActualCompleteDate(null);
+                            inspectTask.setExecutor("");
+                            inspectTask.setCreatedDateTime(now);
+                            inspectTask.setTaskCreateDate(inspectTask.getTaskCreateDate().plusMinutes(1));
+                            inspectTask.setPlanStartDate(now);
+                            inspectTask.setActualStartDate(null);
+                            inspectTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
+                            inspectTask.setModifyUser(null);
+                            inspectTask.setModifiedDateTime(null);
+                            resourceInspectTaskMapper.insert(inspectTask);
+                            break;
+                        }
+                    }
+                }
                 break;
             case "302":
                 // 取消代码、取消描述、取消时间、取消人员