From 215927f99ca1eaded01bd92fc2f8842774831664 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 1 Mar 2024 09:33:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E8=BD=A6=E5=9E=8B=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E5=9C=A8=E4=BA=A7=E8=BD=A6=E9=A2=84=E8=AD=A6=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=8F=90=E5=89=8D=E5=85=AD=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/common/util/DateUtil.java | 16 ++++++++++++++++ .../LawsStandardEarlyWarningServiceImpl.java | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) 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);