修改权限

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

@@ -489,6 +489,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             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()){
@@ -537,6 +538,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(ids, null);
         status.add("0");
         status.add("1");
+        status.add("3");
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks1 = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(ids, status);
         if (!plan.getPlanCycle().equals("0")) {
             startAndEnd = DateUtils.getStartAndEnd(new Date(), Integer.valueOf(plan.getPlanCycle()) + 1);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -415,9 +415,9 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public List<CoreMonitoringRetrievalTask> selectAllTaskByPlanId(List<Long> planId, List<String> status) {
         Long[] longs = planId.toArray(new Long[planId.size()]);
-        String[] strings =null;
-        if (null!=status){
-       strings = status.toArray(new String[status.size()]);
+        String[] strings = null;
+        if (null != status) {
+            strings = status.toArray(new String[status.size()]);
         }
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = coreMonitoringRetrievalTaskMapper.selectAllTaskByPlanId(longs, strings);
         return coreMonitoringRetrievalTasks;
@@ -425,7 +425,11 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public void deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate) {
-        coreMonitoringRetrievalTaskMapper.deleteDayTaskByPlanId(planId, cycle, ymdDate.toString());
+        String date = null;
+        if (null != ymdDate) {
+            date = ymdDate.toString();
+        }
+        coreMonitoringRetrievalTaskMapper.deleteDayTaskByPlanId(planId, cycle, date);
     }
 
     @Override