From cf7eb67176f3321c547f3502e5d4ba52d7ccbcf9 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 21 Nov 2023 17:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=20=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=20=E5=82=AC=E5=8A=9E=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/scheduler/task/EarlyWarningProjectTask.java  | 4 ++++
 .../pmapi/sys/service/impl/ProjectEarlyWarningServiceImpl.java        | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

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<ProjectEarlyWarn
                     warning.setStatus(ProjectEarlyWarningStatusEnum.OVER_TIME.name());
                     break;
                 case ADVENT:
-                    warning.setStatus(ProjectEarlyWarningStatusEnum.OVER_TIME.name());
+                    warning.setStatus(ProjectEarlyWarningStatusEnum.ADVENT_TIME.name());
                     break;
                 default:
                     warning.setStatus(ProjectEarlyWarningStatusEnum.OVER_TIME.name());