Merge remote-tracking branch 'origin/dev' into dev

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

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<Project> projects = projectService.list(queryWrapper);
+         projects = projects.stream().filter(project -> project.getProjectCode().equals("330100000202700003")).collect(Collectors.toList());
         List<ProjectEarlyWarning> projectEarlyWarnings = Lists.newArrayList();
         List<WflowEarlyWarningRecords> earlyWarningRecords = Lists.newArrayList();
         List<ProjectEarlyWarning> 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;
         }