维修完成时，设备当日有通过的点检任务，则不创建新的点检任务

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,6 +259,14 @@ 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) {
+                    if (Constants.RSESULT_OK.equals(inspectTask.getResult())){
+                        bl = false;
+                        break;
+                    }
+                }
+                if (bl){
                     for (ResourceInspectTask inspectTask:inspectTaskList) {
                         // 查询到点检结果为NG的设备，创建新的当日点检任务
                         if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
@@ -270,7 +278,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                             inspectTask.setActualCompleteDate(null);
                             inspectTask.setExecutor("");
                             inspectTask.setCreatedDateTime(now);
-                        inspectTask.setTaskCreateDate(now);
+                            inspectTask.setTaskCreateDate(inspectTask.getTaskCreateDate().plusMinutes(1));
                             inspectTask.setPlanStartDate(now);
                             inspectTask.setActualStartDate(null);
                             inspectTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
@@ -280,6 +288,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                             break;
                         }
                     }
+                }
                 break;
             case "302":
                 // 取消代码、取消描述、取消时间、取消人员