From 1f9720f1bde08636180d04b0340d42055f1af3e2 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 29 Apr 2022 09:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4=E8=BD=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectTaskPlanningServiceImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
index 762af2404..531e4672a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
@@ -92,11 +92,12 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	public List<TimeNodeVO> queryByProjectId(String projectId) {
 		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
 		List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
-		TimeNodeVO listConfirmationVO = new TimeNodeVO();
+		TimeNodeVO listConfirmationVO=null;
+
 		Date now=new Date();
 		Calendar cal1 = Calendar.getInstance();
 		cal1.setTime(now);
-// 将时分秒,毫秒域清零
+		// 将时分秒,毫秒域清零
 		cal1.set(Calendar.HOUR_OF_DAY, 0);
 		cal1.set(Calendar.MINUTE, 0);
 		cal1.set(Calendar.SECOND, 0);
@@ -104,12 +105,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 		Date trueNow = cal1.getTime();
 
 		if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
+			listConfirmationVO = new TimeNodeVO();
 			listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
 			listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
 			if(projectTaskPlanning.getListConfirmation().after(trueNow)){
-				listConfirmationVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else if(projectTaskPlanning.getListConfirmation().before(trueNow)){
 				listConfirmationVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+			}else if(projectTaskPlanning.getListConfirmation().before(trueNow)){
+				listConfirmationVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
 			}else{
 				listConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 			}