diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java index 9c733a4..87b6eee 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java @@ -2,12 +2,10 @@ package com.ningdatech.pmapi.projectlib.model.vo; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ningdatech.basic.util.NdDateUtils; import com.ningdatech.pmapi.common.compare.Compare; import com.ningdatech.pmapi.common.util.BizUtils; import com.ningdatech.pmapi.portrait.model.vo.TagVO; -import com.ningdatech.pmapi.projectdeclared.model.entity.Contract; import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO; import com.ningdatech.pmapi.projectdeclared.model.vo.OperationVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsAcceptancePersonVO; @@ -22,7 +20,6 @@ import lombok.Data; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -420,6 +417,10 @@ public class ProjectDetailVO { @Compare("建设周期(月)") private Integer originBuildCycle; + @ApiModelProperty("计划验收时间(有可能是延期后的)") + @Compare("计划验收时间") + private LocalDateTime planAcceptanceTime; + public String getVersionStr() { if (Objects.nonNull(this.newest) && this.newest) { this.versionStr = "当前版本"; @@ -446,8 +447,9 @@ public class ProjectDetailVO { @ApiModelProperty("项目阶段中文") private String stageName; - public String getStageName(){ - if(Objects.nonNull(this.stage)){ + + public String getStageName() { + if (Objects.nonNull(this.stage)) { return ProjectStatusEnum.getDesc(this.stage); } return StringUtils.EMPTY; @@ -455,8 +457,9 @@ public class ProjectDetailVO { @ApiModelProperty("项目状态中文") private String statusName; - public String getStatusName(){ - if(Objects.nonNull(this.status)){ + + public String getStatusName() { + if (Objects.nonNull(this.status)) { return ProjectStatusEnum.getDesc(this.status); } return StringUtils.EMPTY;