diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningProjectTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningProjectTask.java index a24cc0f..85676ee 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningProjectTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningProjectTask.java @@ -183,6 +183,7 @@ public class EarlyWarningProjectTask { !renewalFundWarning.getDeclaredWarning() && !renewalFundWarning.getOperationWarning()){ renewalFundWarning.setNormal(Boolean.TRUE); + renewalFundWarning.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); } projectEarlyWarningService.updateById(renewalFundWarning); } @@ -223,6 +224,7 @@ public class EarlyWarningProjectTask { !operationWarning.getDeclaredWarning() && !operationWarning.getRenewalFundWarning()){ operationWarning.setNormal(Boolean.TRUE); + operationWarning.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); } projectEarlyWarningService.updateById(operationWarning); } @@ -261,6 +263,7 @@ public class EarlyWarningProjectTask { !declaredWarning.getOperationWarning() && !declaredWarning.getRenewalFundWarning()){ declaredWarning.setNormal(Boolean.TRUE); + declaredWarning.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); } projectEarlyWarningService.updateById(declaredWarning); } @@ -299,6 +302,7 @@ public class EarlyWarningProjectTask { !processWarning.getOperationWarning() && !processWarning.getRenewalFundWarning()){ processWarning.setNormal(Boolean.TRUE); + processWarning.setStatus(ProjectEarlyWarningStatusEnum.NORMAL.name()); } projectEarlyWarningService.updateById(processWarning); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/ProjectEarlyWarningServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/ProjectEarlyWarningServiceImpl.java index 0f3056a..470f25d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/ProjectEarlyWarningServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/ProjectEarlyWarningServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ningdatech.pmapi.common.constant.BizConst; -import com.ningdatech.pmapi.projectlib.mapper.ProjectMapper; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.ningdatech.pmapi.sys.enumeration.ProjectEarlyWarningStatusEnum; @@ -105,7 +104,7 @@ public class ProjectEarlyWarningServiceImpl extends ServiceImpl