|  | @@ -243,7 +243,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 | 
											
												
													
														|  |              //获取计划关联的机构
 |  |              //获取计划关联的机构
 | 
											
												
													
														|  |              List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock().equals(0)).collect(Collectors.toList());
 |  |              List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock().equals(0)).collect(Collectors.toList());
 | 
											
												
													
														|  |              if (CollectionUtil.isNotEmpty(listByType)) {
 |  |              if (CollectionUtil.isNotEmpty(listByType)) {
 | 
											
												
													
														|  | -                //最后参数1标识立即生效0表示按周期生成任务
 |  | 
 | 
											
												
													
														|  |                  List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime, listByType.get(0));
 |  |                  List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime, listByType.get(0));
 | 
											
												
													
														|  |                  if (CollectionUtil.isNotEmpty(list)) {
 |  |                  if (CollectionUtil.isNotEmpty(list)) {
 | 
											
												
													
														|  |                      taskList.addAll(list);
 |  |                      taskList.addAll(list);
 | 
											
										
											
												
													
														|  | @@ -253,9 +252,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 | 
											
												
													
														|  |          //立即生效的计划要排除截至时间在当前时间之前的数据
 |  |          //立即生效的计划要排除截至时间在当前时间之前的数据
 | 
											
												
													
														|  |          List<CoreMonitoringRetrievalTask> lista = taskList.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
 |  |          List<CoreMonitoringRetrievalTask> lista = taskList.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
 | 
											
												
													
														|  |          if(CollectionUtil.isNotEmpty(lista)){
 |  |          if(CollectionUtil.isNotEmpty(lista)){
 | 
											
												
													
														|  | -            taskList.addAll(lista);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            this.saveBatch(lista);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        this.saveBatch(taskList);
 |  | 
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 |