From f693724ef938b7c7ee58a81e333549002052608e Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 24 Aug 2021 15:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResourceInspectPlanServiceImpl.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

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 6a200eb6..6114482e 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
@@ -306,6 +306,9 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
                         ResourceInspectTask equipInspectTask = setResourceInspectTask(resourceInspectPlan, resourceInspectTask,sign);
                         resourceInspectTaskList.add(equipInspectTask);
                         taskCreateDate = addTime(frequencyUnit,frequency,taskCreateDate);
+                        if (taskCreateDate.isAfter(indateEnd)){
+                            break;
+                        }
                         taskNum--;
                     }
                 }else{
@@ -319,12 +322,18 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
                             ResourceInspectTask equipInspectTask = setResourceInspectTask(resourceInspectPlan, resourceInspectTask,sign);
                             resourceInspectTaskList.add(equipInspectTask);
                             taskCreateDate = addTime(frequencyUnit,frequency,taskCreateDate);
+                            if (taskCreateDate.isAfter(indateEnd)){
+                                break;
+                            }
                         }
                     }else {
                         while (taskCreateDate.isBefore(createdDateTime)){
                             taskCreateDate = addTime(frequencyUnit,frequency,taskCreateDate);
                         }
                         for (int i = 0;i < taskNum;i++){
+                            if (taskCreateDate.isAfter(indateEnd)){
+                                break;
+                            }
                             resourceInspectTask.setTaskCreateDate(taskCreateDate);
                             ResourceInspectTask equipInspectTask = setResourceInspectTask(resourceInspectPlan, resourceInspectTask,sign);
                             resourceInspectTaskList.add(equipInspectTask);