From bac4b1c37d8098dfeaa328897c538667aa7ddb39 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jan 2024 17:57:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080609=20=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9=20=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=97=B6=E9=97=B4=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsEvaluationNotMetServiceImpl.java | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
index 4cbd6e4c..e49d0f85 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
@@ -156,17 +156,21 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 		}
 		lawsEvaluationNotMet.setStandardId(standardId);
 		lawsEvaluationNotMet.setSource(source);
-		//判断预警和超期
-		Date expectedTime = lawsEvaluationNotMet.getExpectedTime();
-		DateTime date = DateUtil.date();
-		DateTime theDayBefore = DateUtil.offsetDay(date, 1);
-		DateTime theDayAfter = DateUtil.offsetDay(date, -1);
-		if (expectedTime.compareTo(theDayAfter)<0){
-			lawsEvaluationNotMet.setState(AssessCommon.OVERDUE);
-		}else if (expectedTime.compareTo(theDayBefore)<0){
-			lawsEvaluationNotMet.setState(AssessCommon.WARNING);
+		//如果待整改判断预警和超期
+		String state = lawsEvaluationNotMet.getState();
+		if (AssessCommon.TO_BE_RECTIFIED.equals(state)){
+			Date expectedTime = lawsEvaluationNotMet.getExpectedTime();
+			DateTime date = DateUtil.date();
+			DateTime theDayBefore = DateUtil.offsetDay(date, 1);
+			DateTime theDayAfter = DateUtil.offsetDay(date, -1);
+			if (expectedTime.compareTo(theDayAfter)<0){
+				lawsEvaluationNotMet.setState(AssessCommon.OVERDUE);
+			}else if (expectedTime.compareTo(theDayBefore)<0){
+				lawsEvaluationNotMet.setState(AssessCommon.WARNING);
+			}
 		}
 
+
 	}
 
 	/**