功能修改

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);