From 2488f75104dc318b054642f257e5c980188e0c51 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Thu, 9 Nov 2023 11:58:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=2078360=20=E6=A0=87=E5=87=86=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6--=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=99=E5=8F=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/util/DateUtil.java    | 21 +++++++++++++++
 .../LawsStandardEarlyWarningServiceImpl.java  | 26 +------------------
 2 files changed, 22 insertions(+), 25 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 1c6b475d..59e021e0 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
@@ -115,4 +115,25 @@ public class DateUtil {
 
         return dayStrings;
     }
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/9 11:53
+     * @Description: 获取当前天后一周的时间集合（字符串）
+     **/
+    public static List<String> getNextWeekDateAsString() {
+        LocalDate today = LocalDate.now();
+        LocalDate nextWeek = today.plusWeeks(1);
+
+        List<String> dayStrings = new ArrayList<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        nextWeek = nextWeek.minusDays(1);
+        while (!today.isAfter(nextWeek)) {
+            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 09185f02..bb5e7e8e 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
@@ -59,35 +59,11 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
      **/
     private IPage<StandardEarlyWarning> pageList(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) {
         // 获取当前日前一周的日期字符串集合
-        List<String> dayStrings = DateUtil.getLastWeekDateAsString();
+        List<String> dayStrings = DateUtil.getNextWeekDateAsString();
         log.info("标准预警：当前一周的日期为{}", StringUtils.join(dayStrings, ","));
         standardEarlyWarning.setDayStrings(dayStrings);
         Page<StandardEarlyWarning> page = new Page<>(pageNo, pageSize);
         IPage<StandardEarlyWarning> pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning);
-        /*pageList.getRecords().forEach(warning -> {
-            // 新车型实施日期
-            if (StringUtils.isNotBlank(standardEarlyWarning.getNewModelImplementationDate())) {
-                List<String> eStrings = Arrays.asList(warning.getNewModelImplementationDate().split(","));
-                List<String> intersection = new ArrayList<>();
-                for (String item : dayStrings) {
-                    if (eStrings.contains(item)) {
-                        intersection.add(item);
-                    }
-                }
-                warning.setNewModelImplementationDate(intersection.get(0));
-            }
-            // 在产车实施日期
-            if (StringUtils.isNotBlank(standardEarlyWarning.getOnTheProductionDate())) {
-                List<String> eStrings = Arrays.asList(warning.getOnTheProductionDate().split(","));
-                List<String> intersection = new ArrayList<>();
-                for (String item : dayStrings) {
-                    if (eStrings.contains(item)) {
-                        intersection.add(item);
-                    }
-                }
-                warning.setOnTheProductionDate(intersection.get(0));
-            }
-        });*/
         return pageList;
     }