From ec85704d0e596a9939d6143f6a8da67c8fe2dc4c Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 4 Sep 2024 16:18:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=BB=9E=E5=90=8E=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/hz/pm/api/warning/DelayWarningTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 0d85977..544a0a7 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 @@ -118,6 +118,7 @@ public class DelayWarningTest extends AppTests { .isNotNull(Project::getBuildOrgCode) .eq(Project::getNewest, Boolean.TRUE); List projects = projectService.list(queryWrapper); + projects = projects.stream().filter(project -> project.getProjectCode().equals("330100000202700003")).collect(Collectors.toList()); List projectEarlyWarnings = Lists.newArrayList(); List earlyWarningRecords = Lists.newArrayList(); List needRemoved = Lists.newArrayList(); @@ -317,10 +318,10 @@ public class DelayWarningTest extends AppTests { switch (flowType) { case APPROVED_PROJECT_NOT_PURCHASED: return !isPurchase; - case MODIFIED_NOT_FINAL_INSPECTION: - return !isModified && !isFinalInspection; case PURCHASED_UNMODIFIED: - return isPurchase && !isModified; + return !isModified; + case MODIFIED_NOT_FINAL_INSPECTION: + return !isFinalInspection; default: return false; } From 50feec199e249337d52446963dc02238748f5528 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 4 Sep 2024 16:18:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BB=9E=E5=90=8E=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 3273b41..826dbb2 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 @@ -302,10 +302,10 @@ public class EarlyWarningWithoutSubmitTask { switch (flowType) { case APPROVED_PROJECT_NOT_PURCHASED: return !isPurchase; - case MODIFIED_NOT_FINAL_INSPECTION: - return !isModified && !isFinalInspection; case PURCHASED_UNMODIFIED: - return isPurchase && !isModified; + return !isModified; + case MODIFIED_NOT_FINAL_INSPECTION: + return !isFinalInspection; default: return false; }