diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java index 1fc6e2f..81af26f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java @@ -708,6 +708,7 @@ public class PurchaseManage { adaption.setBizName(w.getBidName()); adaption.setProjectId(w.getProjectId()); Project project = projectMap.get(w.getProjectId()); + adaption.setProjectYear(project.getProjectYear()); adaption.setProjectName(project.getProjectName()); adaption.setBuildOrg(project.getBuildOrgName()); adaption.setProjectStatus(project.getStatus()); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java index 5cfeb33..8ec135b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java @@ -31,6 +31,9 @@ public class PurchaseAdaptionListVO { @ApiModelProperty("标段名称") private String bizName; + @ApiModelProperty("项目年份") + private Integer projectYear; + @ApiModelProperty("项目名称") private String projectName; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java index 10d859b..7625ced 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java @@ -251,6 +251,7 @@ public class DeclaredRecordManage { item.setReviewAmount(w.getReviewAmount()); item.setApprovedAmount(w.getApprovalAmount()); item.setCreateTime(w.getCreateOn()); + item.setProjectYear(w.getProjectYear()); ProjectStatus status = getDeclaredRecordStatus(w.getStatus()); item.setStatus(status.getCode()); item.setStage(status.getStage()); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java index 8a0aac1..850da91 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java @@ -17,6 +17,9 @@ import java.time.LocalDateTime; @Data public class DeclaredProjectListVO { + @ApiModelProperty("项目年份") + private Integer projectYear; + @ApiModelProperty("项目名称") private String projectName;