diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java index 54c7df6e..0831a4ca 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java @@ -200,4 +200,20 @@ public class DateUtil { //格式化前3月的时间 return sdf.format(dBefore); } + + public static List getHalfYearAsString() { + LocalDate today = LocalDate.now(); + LocalDate nextMonth = today.plusMonths(6); + + List dayStrings = new ArrayList<>(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + nextMonth = nextMonth.minusDays(1); + while (!today.isAfter(nextMonth)) { + dayStrings.add(today.format(formatter)); + today = today.plusDays(1); + } + + return dayStrings; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index 6a1fd237..ee652278 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -76,8 +76,8 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa **/ private IPage pageList(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { // 获取当前日前一月的日期字符串集合 - List dayStrings = DateUtil.getNextMonthDateAsString(); - log.info("标准预警:当前一月的日期为{}", StringUtils.join(dayStrings, ",")); + List dayStrings = DateUtil.getHalfYearAsString(); + log.info("标准预警:当前半年的日期为{}", StringUtils.join(dayStrings, ",")); standardEarlyWarning.setDayStrings(dayStrings); Page page = new Page<>(pageNo, pageSize); IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning);