From 4fa8407657884e410479d3f52aecdefcce4a24dc Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Wed, 4 Sep 2024 10:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E5=90=8E=E9=A2=84=E8=AD=A6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9-=E8=8E=B7=E5=8F=96=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/scheduler/task/EarlyWarningWithoutSubmitTask.java  | 14 ++++----------
 .../test/java/com/hz/pm/api/warning/DelayWarningTest.java  | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java
index e5e0678..f31d133 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java
@@ -100,16 +100,10 @@ public class EarlyWarningWithoutSubmitTask {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         // 获取项目库所有建设单位不为空的项目
-        LambdaQueryWrapper<Project> queryWrapper = Wrappers.lambdaQuery(Project.class).isNotNull(Project::getBuildOrgCode);
+        LambdaQueryWrapper<Project> queryWrapper = Wrappers.lambdaQuery(Project.class)
+                .isNotNull(Project::getBuildOrgCode)
+                .eq(Project::getNewest, Boolean.TRUE);
         List<Project> projects = projectService.list(queryWrapper);
-        // 根据项目code分组 获取最新的一条数据
-        Map<String, Project> projectMap = projects.stream().collect(Collectors.groupingBy(Project::getProjectCode, Collectors.collectingAndThen(
-                // 根据创建日期找到最新的记录
-                Collectors.maxBy(Comparator.comparing(Project::getCreateOn)),
-                // 如果没有记录则返回null
-                optional -> optional.orElse(null)
-        )));
-        List<Project> projectList = new ArrayList<>(projectMap.values());
         List<ProjectEarlyWarning> projectEarlyWarnings = Lists.newArrayList();
         List<WflowEarlyWarningRecords> earlyWarningRecords = Lists.newArrayList();
         List<ProjectEarlyWarning> needRemoved = Lists.newArrayList();
@@ -119,7 +113,7 @@ public class EarlyWarningWithoutSubmitTask {
         List<ProjectEarlyWarning> earlyWarnings = projectEarlyWarningService.list(warningQuery);
         Map<String, ProjectEarlyWarning> projectEarlyWarningMap = CollUtils.listToMap(earlyWarnings, c -> c.getProjectCode() + StrPool.DASH + c.getStepName());
         // 遍历项目 获取对应申报单位的滞后预警规则
-        for (Project project : projectList) {
+        for (Project project : projects) {
             String buildOrgCode = project.getBuildOrgCode();
             String projectCode = project.getProjectCode();
             Long mhUnitId = Long.valueOf(buildOrgCode);
diff --git a/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java b/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java
index b502b7b..0d85977 100644
--- a/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java
+++ b/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java
@@ -114,16 +114,10 @@ public class DelayWarningTest extends AppTests {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         // 获取项目库所有建设单位不为空的项目
-        LambdaQueryWrapper<Project> queryWrapper = Wrappers.lambdaQuery(Project.class).isNotNull(Project::getBuildOrgCode);
+        LambdaQueryWrapper<Project> queryWrapper = Wrappers.lambdaQuery(Project.class)
+                .isNotNull(Project::getBuildOrgCode)
+                .eq(Project::getNewest, Boolean.TRUE);
         List<Project> projects = projectService.list(queryWrapper);
-        // 根据项目code分组 获取最新的一条数据
-        Map<String, Project> projectMap = projects.stream().collect(Collectors.groupingBy(Project::getProjectCode, Collectors.collectingAndThen(
-                // 根据创建日期找到最新的记录
-                Collectors.maxBy(Comparator.comparing(Project::getCreateOn)),
-                // 如果没有记录则返回null
-                optional -> optional.orElse(null)
-        )));
-        List<Project> projectList = new ArrayList<>(projectMap.values());
         List<ProjectEarlyWarning> projectEarlyWarnings = Lists.newArrayList();
         List<WflowEarlyWarningRecords> earlyWarningRecords = Lists.newArrayList();
         List<ProjectEarlyWarning> needRemoved = Lists.newArrayList();
@@ -133,7 +127,7 @@ public class DelayWarningTest extends AppTests {
         List<ProjectEarlyWarning> earlyWarnings = projectEarlyWarningService.list(warningQuery);
         Map<String, ProjectEarlyWarning> projectEarlyWarningMap = CollUtils.listToMap(earlyWarnings, c -> c.getProjectCode() + StrPool.DASH + c.getStepName());
         // 遍历项目 获取对应申报单位的滞后预警规则
-        for (Project project : projectList) {
+        for (Project project : projects) {
             String buildOrgCode = project.getBuildOrgCode();
             String projectCode = project.getProjectCode();
             Long mhUnitId = Long.valueOf(buildOrgCode);