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; } 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; }