From a9d2ab19d082d30af7d4555b23f8b11cb32e08e7 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 27 Jul 2021 10:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97=E6=9B=B4?=
 =?UTF-8?q?=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    | 1 +
 equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml  | 4 ++--
 3 files changed, 5 insertions(+), 2 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 e672cf6e..76ddd899 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
@@ -415,6 +415,8 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
             case "M":
                 minutes = Math.round(frequency*60*24*7*30);
                 break;
+            default:
+                throw BusinessException.build("周期时间不存在！");
         }
         return taskTime.plusMinutes(minutes);
     }
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 e2e9f2c7..1f90c0c8 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
@@ -151,6 +151,7 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         if( status.equals(Constants.INSPECTION_TASK_STATUS_CANCEL) ){
             task.setExecutor(CommonMethods.getUser());
             task.setReason(reason);
+            task.setModifiedDateTime(LocalDateTime.now());
             // 取消时，创建新任务
             resourceInspectPlanService.autoCreateTaskByResourceInspectTask(task);
         }
diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
index c3956576..442e923a 100644
--- a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
@@ -893,8 +893,8 @@
         LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
         INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
         WHERE RRT.SITE = #{site}
-        <if test="resourceBo != null and resourceBo != ''">
-            AND RRT.RESOURCE_BO = #{resourceBo}
+        <if test="resourceNo != null and resourceNo != ''">
+            AND RRT.RESOURCE_NO = #{resourceNo}
         </if>
         <if test="resourceTypeBo != null and resourceTypeBo != ''">
             AND RTR.RESOURCE_TYPE_BO = #{resourceTypeBo}