提交 4ad22e47 作者: 925993793@qq.com

【fix】资讯查询bug修改

上级 0d36d106
...@@ -1780,12 +1780,24 @@ public class EsService { ...@@ -1780,12 +1780,24 @@ public class EsService {
String id = subjectIdList.get(0); String id = subjectIdList.get(0);
if (category == 1) { if (category == 1) {
Subject subject = subjectService.getById(id); Subject subject = subjectService.getById(id);
configStartTime = DateUtil.dateToString(subject.getTimeEnable()); Date timeEnable = subject.getTimeEnable();
configEndTime = DateUtil.dateToString(subject.getTimeDisable()); if (!Objects.isNull(timeEnable)) {
configStartTime = DateUtil.dateToString(timeEnable);
}
Date timeDisable = subject.getTimeDisable();
if (!Objects.isNull(timeDisable)) {
configEndTime = DateUtil.dateToString(timeDisable);
}
} else if (category == 2) { } else if (category == 2) {
Event event = eventService.getById(id); Event event = eventService.getById(id);
configStartTime = DateUtil.dateToString(event.getStartTime()); Date startTime = event.getStartTime();
configEndTime = DateUtil.dateToString(event.getEndTime()); if (!Objects.isNull(startTime)) {
configStartTime = DateUtil.dateToString(startTime);
}
Date endTime = event.getEndTime();
if (!Objects.isNull(endTime)) {
configEndTime = DateUtil.dateToString(endTime);
}
} }
//时间过滤筛选-专题配置 //时间过滤筛选-专题配置
if (StringUtils.isNotBlank(configStartTime)) { if (StringUtils.isNotBlank(configStartTime)) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论