Commit 23b51b48 by huluobin

update

parent a8f8bfcc
...@@ -352,14 +352,15 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -352,14 +352,15 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
}); });
}).get(); }).get();
if (!qry.getShowNodeDetail()) { myPool.shutdown();
if (qry.getShowNodeDetail() != null && !qry.getShowNodeDetail()) {
idleTimeDTOList.forEach(idleTimeDTO -> { idleTimeDTOList.forEach(idleTimeDTO -> {
idleTimeDTO.setDefaultNodeList(null); idleTimeDTO.setDefaultNodeList(null);
idleTimeDTO.setTreeProgram(null); idleTimeDTO.setTreeProgram(null);
}); });
} }
myPool.shutdown();
return idleTimeDTOList.stream().sorted(Comparator.comparing(IdleTimeDTO::getTime)).collect(Collectors.toList()); return idleTimeDTOList.stream().sorted(Comparator.comparing(IdleTimeDTO::getTime)).collect(Collectors.toList());
} }
......
...@@ -124,5 +124,5 @@ public class IdleTimeProgramQuery { ...@@ -124,5 +124,5 @@ public class IdleTimeProgramQuery {
private List<Long> dateTimeList; private List<Long> dateTimeList;
@TableField(exist = false) @TableField(exist = false)
private Boolean showNodeDetail = true; private Boolean showNodeDetail;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment