From a38556706eb4308abba2085904d783345297d291 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 May 2022 13:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85--=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BD=B4=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTaskPlanningController.java        |  10 +-
 .../mapper/ProjectTaskPlanningMapper.java     |   6 +-
 .../mapper/xml/ProjectTaskPlanningMapper.xml  |  14 +-
 .../service/IProjectTaskPlanningService.java  |   4 +-
 .../impl/ProjectTaskPlanningServiceImpl.java  | 297 +++++++++---------
 5 files changed, 175 insertions(+), 156 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java
index 48d0b509a..c689e44d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java
@@ -69,8 +69,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-列表查询", notes="法规,认证任务计划 (各阶段确认进度) 表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<ProjectTaskPlanning> queryList(@RequestParam(name="projectId",required=true) String projectId) {
-        ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.queryList(projectId);
-        return Result.OK(projectTaskPlanning);
+		List<ProjectTaskPlanning> projectTaskPlanning = projectTaskPlanningService.queryList(projectId);
+        return Result.OK(projectTaskPlanning.get(0));
 	}
 
 	/**
@@ -140,11 +140,11 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	@GetMapping(value = "/queryByProjectId")
 	public Result<?> queryByProjectId(@RequestParam(name="projectId",required=true) String projectId,
 									  @RequestParam(name="cut",required=true) String cut) {
-		List<TimeNodeVO> projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId,cut);
-		if(projectTaskPlanning==null) {
+		List<List<TimeNodeVO>> result = projectTaskPlanningService.queryByProjectId(projectId,cut);
+		if(result.size() == 0) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(projectTaskPlanning);
+		return Result.OK(result.get(0));
 	}
 
     /**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskPlanningMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskPlanningMapper.java
index 5bcc74c21..b9658b687 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskPlanningMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskPlanningMapper.java
@@ -2,6 +2,7 @@ package com.jero.modules.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +14,8 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface ProjectTaskPlanningMapper extends BaseMapper<ProjectTaskPlanning> {
-    @Select("SELECT * FROM project_task_planning where project_id=#{projectId}")
-    ProjectTaskPlanning getByProjectId(String projectId);
+
+//    @Select("SELECT * FROM project_task_planning where project_id=#{projectId}")
+    List<ProjectTaskPlanning> getByProjectId(@Param("projectId") String projectId);
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml
index c5f5cd18d..a883441db 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml
@@ -12,4 +12,16 @@
         <result column="attestation_end_time" property="attestationEndTime" />
         <result column="verify_deadline" property="verifyDeadline" />
     </resultMap>
-</mapper>
\ No newline at end of file
+
+
+    <select id="getByProjectId" resultMap="ProjectTaskPlanningResultMap">
+        SELECT * FROM project_task_planning
+        where 1 = 1
+        <if test="projectId != null" >
+            and project_id in
+            <foreach collection="projectId.split(',')" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java
index 8cc1ff17f..441d49700 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java
@@ -52,12 +52,12 @@ public interface IProjectTaskPlanningService extends IService<ProjectTaskPlannin
 	 * @param projectId
 	 * @return
 	 */
-	List<TimeNodeVO> queryByProjectId(String projectId,String cut);
+	List<List<TimeNodeVO>> queryByProjectId(String projectId,String cut);
 
 	/**
 	 * 列表查询
 	 *
 	 * @return
 	 */
-    ProjectTaskPlanning queryList(String projectId);
+	List<ProjectTaskPlanning> queryList(String projectId);
 }
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 4b3ecf542..cea55c4c0 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
@@ -90,8 +90,9 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * @return
 	 */
 	@Override
-	public List<TimeNodeVO> queryByProjectId(String projectId,String cut) {
-		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
+	public List<List<TimeNodeVO>> queryByProjectId(String projectId,String cut) {
+		List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId);
+		List<List<TimeNodeVO>> result = new ArrayList<>();
 		List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
 		TimeNodeVO listConfirmationVO=null;
 
@@ -104,156 +105,160 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 		cal1.set(Calendar.SECOND, 0);
 		cal1.set(Calendar.MILLISECOND, 0);
 		Date trueNow = cal1.getTime();
+		for (ProjectTaskPlanning projectTaskPlanning : projectTaskPlanningList) {
+			if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
+				listConfirmationVO = new TimeNodeVO();
 
-		if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
-			listConfirmationVO = new TimeNodeVO();
+				if(CutEnum.CN.getValue().equals(cut)){
+					listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
+				}else{
+					listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getValue());
+				}
 
-			if(CutEnum.CN.getValue().equals(cut)){
-				listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
-			}else{
-				listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getValue());
+				listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
+				if(projectTaskPlanning.getListConfirmation().after(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());
+				}
+				timeNodeVOS.add(listConfirmationVO);
 			}
 
-			listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
-			if(projectTaskPlanning.getListConfirmation().after(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());
+			if(!StringUtils.isEmpty(projectTaskPlanning.getLegalTaskConfirmation().toString())) {
+				TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
+				}else{
+					legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getValue());
+				}
+
+				legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
+				if(projectTaskPlanning.getLegalTaskConfirmation().after(trueNow)){
+					legalTaskConfirmationVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getLegalTaskConfirmation().before(trueNow)){
+					legalTaskConfirmationVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else {
+					legalTaskConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVOS.add(legalTaskConfirmationVO);
 			}
-			timeNodeVOS.add(listConfirmationVO);
+
+			if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) {
+				TimeNodeVO designDeadlineVO = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
+				}else{
+					designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getValue());
+				}
+
+				designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
+				if(projectTaskPlanning.getDesignDeadline().after(trueNow)){
+					designDeadlineVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getDesignDeadline().before(trueNow)){
+					designDeadlineVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					designDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVOS.add(designDeadlineVO);
+			}
+
+			if(StringUtils.isNotBlank(projectTaskPlanning.getPrehomoDeadline().toString())) {
+				TimeNodeVO prehomoDeadlineVO = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
+				}else{
+					prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getValue());
+				}
+
+				prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline());
+				if(projectTaskPlanning.getPrehomoDeadline().after(trueNow)){
+					prehomoDeadlineVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getPrehomoDeadline().before(trueNow)){
+					prehomoDeadlineVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					prehomoDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVOS.add(prehomoDeadlineVO);
+			}
+
+			if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationStartTime().toString())) {
+				TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
+				}else{
+					attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getValue());
+				}
+
+				attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime());
+				if(projectTaskPlanning.getAttestationStartTime().after(trueNow)){
+					attestationStartTimeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getAttestationStartTime().before(trueNow)){
+					attestationStartTimeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					attestationStartTimeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVOS.add(attestationStartTimeVO);
+			}
+			if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationEndTime().toString())) {
+				TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
+				}else{
+					attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue());
+				}
+
+				attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime());
+				if(projectTaskPlanning.getAttestationEndTime().after(trueNow)){
+					attestationEndTimeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getAttestationEndTime().before(trueNow)){
+					attestationEndTimeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					attestationEndTimeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVOS.add(attestationEndTimeVO);
+			}
+
+			if(StringUtils.isNotBlank(projectTaskPlanning.getVerifyDeadline().toString())) {
+				TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
+				}else{
+					verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getValue());
+				}
+
+				verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
+				if(projectTaskPlanning.getVerifyDeadline().after(trueNow)){
+					verifyDeadlineVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getVerifyDeadline().before(trueNow)){
+					verifyDeadlineVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					verifyDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVOS.add(verifyDeadlineVO);
+			}
+			// 排序
+			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());
+				}
+
+			}
+			result.add(timeNodeVOS);
 		}
 
-		if(!StringUtils.isEmpty(projectTaskPlanning.getLegalTaskConfirmation().toString())) {
-			TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
 
-			if(CutEnum.CN.getValue().equals(cut)){
-				legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
-			}else{
-				legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getValue());
-			}
-
-			legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
-			if(projectTaskPlanning.getLegalTaskConfirmation().after(trueNow)){
-				legalTaskConfirmationVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(projectTaskPlanning.getLegalTaskConfirmation().before(trueNow)){
-				legalTaskConfirmationVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else {
-				legalTaskConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
-			}
-			timeNodeVOS.add(legalTaskConfirmationVO);
-		}
-
-		if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) {
-			TimeNodeVO designDeadlineVO = new TimeNodeVO();
-
-			if(CutEnum.CN.getValue().equals(cut)){
-				designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
-			}else{
-				designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getValue());
-			}
-
-			designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
-			if(projectTaskPlanning.getDesignDeadline().after(trueNow)){
-				designDeadlineVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(projectTaskPlanning.getDesignDeadline().before(trueNow)){
-				designDeadlineVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else{
-				designDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
-			}
-			timeNodeVOS.add(designDeadlineVO);
-		}
-
-		if(StringUtils.isNotBlank(projectTaskPlanning.getPrehomoDeadline().toString())) {
-			TimeNodeVO prehomoDeadlineVO = new TimeNodeVO();
-
-			if(CutEnum.CN.getValue().equals(cut)){
-				prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
-			}else{
-				prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getValue());
-			}
-
-			prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline());
-			if(projectTaskPlanning.getPrehomoDeadline().after(trueNow)){
-				prehomoDeadlineVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(projectTaskPlanning.getPrehomoDeadline().before(trueNow)){
-				prehomoDeadlineVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else{
-				prehomoDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
-			}
-			timeNodeVOS.add(prehomoDeadlineVO);
-		}
-
-		if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationStartTime().toString())) {
-			TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
-
-			if(CutEnum.CN.getValue().equals(cut)){
-				attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
-			}else{
-				attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getValue());
-			}
-
-			attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime());
-			if(projectTaskPlanning.getAttestationStartTime().after(trueNow)){
-				attestationStartTimeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(projectTaskPlanning.getAttestationStartTime().before(trueNow)){
-				attestationStartTimeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else{
-				attestationStartTimeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
-			}
-			timeNodeVOS.add(attestationStartTimeVO);
-		}
-		if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationEndTime().toString())) {
-			TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
-
-			if(CutEnum.CN.getValue().equals(cut)){
-				attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
-			}else{
-				attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue());
-			}
-
-			attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime());
-			if(projectTaskPlanning.getAttestationEndTime().after(trueNow)){
-				attestationEndTimeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(projectTaskPlanning.getAttestationEndTime().before(trueNow)){
-				attestationEndTimeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else{
-				attestationEndTimeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
-			}
-			timeNodeVOS.add(attestationEndTimeVO);
-		}
-
-		if(StringUtils.isNotBlank(projectTaskPlanning.getVerifyDeadline().toString())) {
-			TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
-
-			if(CutEnum.CN.getValue().equals(cut)){
-				verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
-			}else{
-				verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getValue());
-			}
-
-			verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
-			if(projectTaskPlanning.getVerifyDeadline().after(trueNow)){
-				verifyDeadlineVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(projectTaskPlanning.getVerifyDeadline().before(trueNow)){
-				verifyDeadlineVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else{
-				verifyDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
-			}
-			timeNodeVOS.add(verifyDeadlineVO);
-		}
-		// 排序
-		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;
+		return result;
 	}
 
 	/**
@@ -262,8 +267,8 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * @return
 	 */
 	@Override
-	public ProjectTaskPlanning queryList(String projectId) {
-		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
+	public List<ProjectTaskPlanning> queryList(String projectId) {
+		List<ProjectTaskPlanning> projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
 		return projectTaskPlanning;
 	}