xiugbug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -527,11 +527,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 plan.setPlanStatus(0);
                 coreMonitoringRetrievalTaskBuilderService.deleteAllTaskByPlanIds(collect);
             }
-            //无周期删除所有任务
-      /*      if (plan.getPlanCycle().equals("0")) {
-                coreMonitoringRetrievalTaskBuilderService.deleteAllTaskByPlanIds(collect);
-            }*/
-
             for (TMonitoringRetrievalPlan tMonitoringRetrievalPlan : list1) {
                 if (!isComplete) {
                     tMonitoringRetrievalPlan.setPlanStatus(2);
@@ -548,7 +543,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 switch (plan.getPlanCycle()) {
                     //天
                     case "1":
-                        LocalDate localDate = LocalDate.now();
                         //不存在已完成,有已完成不删
                         if (isComplete) {
                             coreMonitoringRetrievalTaskBuilderService.deleteDayTaskByPlanId(plan.getId(), plan.getPlanCycle(), null);
@@ -566,6 +560,22 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         } else if (plan.getPlanCycle().equals("0")) {
             collect.add(id);
             coreMonitoringRetrievalTaskBuilderService.deleteAllTaskByPlanIds(collect);
+        } else if (CollectionUtils.isEmpty(list1)) {
+            collect.add(id);
+            List<String> status = new ArrayList<>();
+            List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, null);
+            status.add("0");
+            status.add("1");
+            status.add("3");
+            List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks1 = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
+            Boolean isComplete = false;
+            if (coreMonitoringRetrievalTasks.size() == coreMonitoringRetrievalTasks1.size()) {
+                isComplete = true;
+            }
+            if (isComplete) {
+                plan.setPlanStatus(0);
+                coreMonitoringRetrievalTaskBuilderService.deleteAllTaskByPlanIds(collect);
+            }
         }
 
         List<String> status = new ArrayList<>();