diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index fcb7571..fc2113d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java @@ -453,10 +453,17 @@ public class Project implements Serializable { @Compare("合同总金额") private BigDecimal contractAmount; - @ApiModelProperty("计划验收时间") + @ApiModelProperty("计划验收时间(有可能是延期后的)") @Compare("计划验收时间") private LocalDateTime planAcceptanceTime; + @ApiModelProperty("原本计划验收时间") + @Compare("原本计划验收时间") + private LocalDateTime originPlanAcceptanceTime; + + @ApiModelProperty("延期月份数") + private Integer applyDelayMonths; + @ApiModelProperty("申请延期佐证材料") private String applyDelayFile; 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 edaab44..d783d14 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 @@ -4,6 +4,7 @@ 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.projectdeclared.model.entity.Contract; import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO; @@ -398,6 +399,13 @@ public class ProjectDetailVO { @ApiModelProperty("是否退回|驳回的项目版本") private Boolean isBackReject; + @ApiModelProperty("原本计划验收时间") + @Compare("原本计划验收时间") + private LocalDateTime originPlanAcceptanceTime; + + @ApiModelProperty("延期月份数") + private Integer applyDelayMonths; + public String getVersionStr() { if (Objects.nonNull(this.newest) && this.newest) { this.versionStr = "当前版本";