From 4f18e1a1a592986674b914d310f1cb9930a0e32f Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 29 Apr 2022 10:28:48 +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      | 8 ++++++++
 1 file changed, 8 insertions(+)

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 531e4672a..7cb20e77b 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
@@ -198,6 +198,14 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 		}
 		// 排序
 		Collections.sort(timeNodeVOS, listConfirmationVO);
+		//设置在已过时,和未发生之间的数据的状态为进行中
+		for(int i=0;i<timeNodeVOS.size();i++){
+			if(timeNodeVOS.get(i).getStatus().equals(PlanStatusEnum.OUT_OF_DATE.getValue())
+					&& timeNodeVOS.get(i+1).getStatus().equals(PlanStatusEnum.LESS_THAN_TIME.getValue())){
+				timeNodeVOS.get(i+1).setStatus(PlanStatusEnum.ON_GOING.getValue());
+			}
+
+		}
 		return timeNodeVOS;
 	}