diff --git a/schedule/src/main/java/com/hfkj/schedule/CmsSchedule.java b/schedule/src/main/java/com/hfkj/schedule/CmsSchedule.java index 78cc568..9a2d5eb 100644 --- a/schedule/src/main/java/com/hfkj/schedule/CmsSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/CmsSchedule.java @@ -35,7 +35,7 @@ public class CmsSchedule { try { Map param = new HashMap<>(); param.put("status", CmsStatusEnum.status1.getStatus()); - param.put("createTimeS", new Date().getTime()); + param.put("startTimeS", new Date().getTime()); List list = cmsContentService.getList(param); for (CmsContent data : list) { cmsContentService.online(data.getId()); @@ -53,7 +53,7 @@ public class CmsSchedule { try { Map param = new HashMap<>(); param.put("status", CmsStatusEnum.status2.getStatus()); - param.put("createTimeE", new Date().getTime()); + param.put("endTimeE", new Date().getTime()); List list = cmsContentService.getList(param); for (CmsContent data : list) { cmsContentService.offline(data.getId()); diff --git a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java index 2cae3d0..8224758 100644 --- a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java @@ -106,6 +106,22 @@ public class CmsContentServiceImpl implements CmsContentService { criteria.andCreateTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "createTimeE"))); } + if (MapUtils.getLong(param, "startTimeS") != null) { + criteria.andStartTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "startTimeS"))); + } + + if (MapUtils.getLong(param, "startTimeE") != null) { + criteria.andStartTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "startTimeE"))); + } + + if (MapUtils.getLong(param, "endTimeS") != null) { + criteria.andEndTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "endTimeS"))); + } + + if (MapUtils.getLong(param, "endTimeE") != null) { + criteria.andEndTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "endTimeE"))); + } + example.setOrderByClause("update_time desc"); return cmsContentMapper.selectByExample(example); }