From e2fe9edb931065a3f92a69ef66e588b93bb36057 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 7 Sep 2021 09:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=BD=93=E6=97=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResourceRepairTaskServiceImpl.java   | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 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 07a59942..9d38f159 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
@@ -206,6 +206,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
         String status = resourceRepairTask.getStatus();
         String handle = resourceRepairTask.getHandle();
         String user = CommonMethods.getUser();
+        LocalDateTime now = LocalDateTime.now();
         ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle);
         String site = repairTask.getSite();
         switch (status){
@@ -215,12 +216,12 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                     spare.setCreateUser(user);
                     spare.setHandle(HandleEnum.RESOURCE_INSPECT_TASK_SPARE.getHandle(site,UUID.randomUUID().toString()));
                     spare.setResourceInspectTaskBo(handle);
-                    spare.setCreatedDateTime(LocalDateTime.now());
+                    spare.setCreatedDateTime(now);
                 }
                 resourceInspectTaskSpareService.saveBatch(spareList);
                 repairTask.setSpareList(spareList);
                 // 完成时间、维修人员
-                repairTask.setActualCompleteDate(LocalDateTime.now());
+                repairTask.setActualCompleteDate(now);
                 String repairUsers = resourceRepairTask.getRepairUsers();
                 String[] split = repairUsers.split(",");
                 for (int i = 0; i < split.length; i++) {
@@ -251,16 +252,27 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 ResourceInspectTask resourceInspectTask = new ResourceInspectTask();
                 resourceInspectTask.setSite(site);
                 resourceInspectTask.setCategory(Constants.INSPECTION_TYPE_DM);
-                LocalDate now = LocalDate.now();
-                LocalDateTime startDate = LocalDateTime.parse(now + "T00:00:00");
-                LocalDateTime endDate = LocalDateTime.parse(now.plusDays(1) + "T00:00:00");
+                LocalDate toDay = LocalDate.now();
+                LocalDateTime startDate = LocalDateTime.parse(toDay + "T00:00:00");
+                LocalDateTime endDate = LocalDateTime.parse(toDay.plusDays(1) + "T00:00:00");
                 resourceInspectTask.setPlanStartDate(startDate);
                 resourceInspectTask.setPlanCompleteDate(endDate);
                 resourceInspectTask.setResrce(resourceRepairTask.getResourceNo());
                 List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask);
                 for (ResourceInspectTask inspectTask:inspectTaskList) {
+                    // 查询到点检结果为NG的设备，创建新的当日点检任务
                     if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
-                        resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask);
+                        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);
+                        resourceInspectTaskMapper.insert(inspectTask);
                         break;
                     }
                 }
@@ -269,7 +281,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 // 取消代码、取消描述、取消时间、取消人员
                 repairTask.setCancelCode(resourceRepairTask.getCancelCode());
                 repairTask.setCancelDescription(resourceRepairTask.getCancelDescription());
-                repairTask.setCancelDate(LocalDateTime.now());
+                repairTask.setCancelDate(now);
                 repairTask.setCancelUser(user);
                 NwaUser userByUserName = nwaUserService.findUserByUserName(user);
                 repairTask.setCancelUserName(userByUserName.getFullName());
@@ -278,13 +290,13 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 if (repairTask.getWaitStartDate() != null){
                     throw BusinessException.build("已有等待记录，不能再次进入等待状态！！！");
                 }else {
-                    repairTask.setWaitStartDate(LocalDateTime.now());
+                    repairTask.setWaitStartDate(now);
                     repairTask.setWaitDescription(resourceRepairTask.getWaitDescription());
                 }
                 break;
             case "501":
                 // 结束时间、等待时长
-                repairTask.setWaitEndDate(LocalDateTime.now());
+                repairTask.setWaitEndDate(now);
                 Duration betweenTime = Duration.between(repairTask.getWaitStartDate(), repairTask.getWaitEndDate());
                 Long waitMinutes = betweenTime.toMinutes();
                 double waitHours = waitMinutes.doubleValue()/60.00;
@@ -294,7 +306,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
         // 状态、修改人、修改时间
         repairTask.setStatus(status);
         repairTask.setModifyUser(user);
-        repairTask.setModifiedDateTime(LocalDateTime.now());
+        repairTask.setModifiedDateTime(now);
         resourceRepairTaskService.saveOrUpdate(repairTask);
         return repairTask;
     }