diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java index b85c81f..558ee4d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java @@ -139,8 +139,8 @@ public class EarlyWarningProjectTask { if (!projectStatus.eq(project.getStatus())) { checkCommited(delay, flowTypeEnum, projectCode); // 其它几种 都没有 说明已经正常了 - if (!delay.getProcessWarning() && - !delay.getDeclaredWarning()) { + if (Boolean.FALSE.equals(delay.getProcessWarning()) && + Boolean.FALSE.equals(delay.getDeclaredWarning())) { delay.setNormal(Boolean.TRUE); delay.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); } @@ -177,8 +177,8 @@ public class EarlyWarningProjectTask { if (!projectStatus.eq(project.getStatus())) { checkCommited(declaredWarning, flowTypeEnum, projectCode); // 其它几种 都没有 说明已经正常了 - if (!declaredWarning.getProcessWarning() && - !declaredWarning.getDelayWarning()) { + if (Boolean.FALSE.equals(declaredWarning.getProcessWarning()) && + Boolean.FALSE.equals(declaredWarning.getDelayWarning())) { declaredWarning.setNormal(Boolean.TRUE); declaredWarning.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); } @@ -255,8 +255,8 @@ public class EarlyWarningProjectTask { //说明 已经审批通过了 processWarning.setProcessWarning(Boolean.FALSE); //其它三种 都没有 说明已经正常了 - if (!processWarning.getDeclaredWarning() && - !processWarning.getDelayWarning()) { + if (Boolean.FALSE.equals(processWarning.getDeclaredWarning()) && + Boolean.FALSE.equals(processWarning.getDelayWarning())) { processWarning.setNormal(Boolean.TRUE); processWarning.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); }