From fd8d08eb209b5eacc2ef7f576b8109489726deb8 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Sun, 8 May 2022 20:46:21 +0800
Subject: [PATCH] =?UTF-8?q?bug51798-=E6=B3=95=E8=A7=84/=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4=E8=BD=B4?=
 =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTaskPlanningController.java        |  5 +-
 .../enums/ProjectTaskPlanningNameEnum.java    | 28 ++++---
 .../service/IProjectTaskPlanningService.java  |  2 +-
 .../impl/ProjectTaskPlanningServiceImpl.java  | 83 +++++++++++++++----
 4 files changed, 87 insertions(+), 31 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 7dc8eb7cc..48d0b509a 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
@@ -138,8 +138,9 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询")
 	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询", notes="法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询")
 	@GetMapping(value = "/queryByProjectId")
-	public Result<?> queryByProjectId(@RequestParam(name="projectId",required=true) String projectId) {
-		List<TimeNodeVO> projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId);
+	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) {
 			return Result.error("未找到对应数据");
 		}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
index 6e8e635d9..07e172834 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
@@ -1,21 +1,21 @@
 package com.jero.modules.project.enums;
 
 public enum ProjectTaskPlanningNameEnum {
-    LIST_CONFIRMATION("法规清单确认"),
-    LEGAL_TASK_CONFIRMATION("法规任务确认"),
-    DESIGN_DEADLINE("设计符合性确认截止时间"),
-    PREHOMO_DEADLINE("PreHomo确认截止时间"),
-    ATTESTATION_START_TIME("认证开始"),
-    ATTESTATION_END_TIME("认证结束"),
-    VERIFY_DEADLINE("验证符合性确认截止时间"),
+    LIST_CONFIRMATION("法规清单确认","listConfirmation"),
+    LEGAL_TASK_CONFIRMATION("法规任务确认","legalTaskConfirmation"),
+    DESIGN_DEADLINE("设计符合性确认截止时间","designDeadline"),
+    PREHOMO_DEADLINE("PreHomo确认截止时间","prehomoDeadline"),
+    ATTESTATION_START_TIME("认证开始","attestationStartTime"),
+    ATTESTATION_END_TIME("认证结束","attestationEndTime"),
+    VERIFY_DEADLINE("验证符合性确认截止时间","verifyDeadline"),
 
     ;
     String name;
+    String value;
 
-
-    ProjectTaskPlanningNameEnum(String name) {
+    ProjectTaskPlanningNameEnum(String name, String value) {
         this.name = name;
-
+        this.value = value;
     }
 
     public String getName() {
@@ -25,4 +25,12 @@ public enum ProjectTaskPlanningNameEnum {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
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 a084d82f7..8cc1ff17f 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,7 +52,7 @@ public interface IProjectTaskPlanningService extends IService<ProjectTaskPlannin
 	 * @param projectId
 	 * @return
 	 */
-	List<TimeNodeVO> queryByProjectId(String projectId);
+	List<TimeNodeVO> queryByProjectId(String projectId,String cut);
 
 	/**
 	 * 列表查询
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 7cb20e77b..4b3ecf542 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
@@ -2,6 +2,7 @@ package com.jero.modules.project.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
 import com.jero.modules.project.enums.PlanStatusEnum;
@@ -89,7 +90,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * @return
 	 */
 	@Override
-	public List<TimeNodeVO> queryByProjectId(String projectId) {
+	public List<TimeNodeVO> queryByProjectId(String projectId,String cut) {
 		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
 		List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
 		TimeNodeVO listConfirmationVO=null;
@@ -106,7 +107,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 
 		if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
 			listConfirmationVO = new TimeNodeVO();
-			listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
+
+			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());
@@ -120,7 +127,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 
 		if(!StringUtils.isEmpty(projectTaskPlanning.getLegalTaskConfirmation().toString())) {
 			TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
-			legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
+
+			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());
@@ -131,22 +144,36 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 			}
 			timeNodeVOS.add(legalTaskConfirmationVO);
 		}
-			if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) {
-				TimeNodeVO designDeadlineVO = new TimeNodeVO();
+
+		if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) {
+			TimeNodeVO designDeadlineVO = new TimeNodeVO();
+
+			if(CutEnum.CN.getValue().equals(cut)){
 				designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
-				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);
+			}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();
-			prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
+
+			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());
@@ -157,9 +184,16 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 			}
 			timeNodeVOS.add(prehomoDeadlineVO);
 		}
+
 		if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationStartTime().toString())) {
 			TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
-			attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
+
+			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());
@@ -172,7 +206,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 		}
 		if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationEndTime().toString())) {
 			TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
-			attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
+
+			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());
@@ -183,9 +223,16 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 			}
 			timeNodeVOS.add(attestationEndTimeVO);
 		}
+
 		if(StringUtils.isNotBlank(projectTaskPlanning.getVerifyDeadline().toString())) {
 			TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
-			verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
+
+			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());