@@ -708,6 +708,7 @@ public class PurchaseManage { | |||||
adaption.setBizName(w.getBidName()); | adaption.setBizName(w.getBidName()); | ||||
adaption.setProjectId(w.getProjectId()); | adaption.setProjectId(w.getProjectId()); | ||||
Project project = projectMap.get(w.getProjectId()); | Project project = projectMap.get(w.getProjectId()); | ||||
adaption.setProjectYear(project.getProjectYear()); | |||||
adaption.setProjectName(project.getProjectName()); | adaption.setProjectName(project.getProjectName()); | ||||
adaption.setBuildOrg(project.getBuildOrgName()); | adaption.setBuildOrg(project.getBuildOrgName()); | ||||
adaption.setProjectStatus(project.getStatus()); | adaption.setProjectStatus(project.getStatus()); | ||||
@@ -31,6 +31,9 @@ public class PurchaseAdaptionListVO { | |||||
@ApiModelProperty("标段名称") | @ApiModelProperty("标段名称") | ||||
private String bizName; | private String bizName; | ||||
@ApiModelProperty("项目年份") | |||||
private Integer projectYear; | |||||
@ApiModelProperty("项目名称") | @ApiModelProperty("项目名称") | ||||
private String projectName; | private String projectName; | ||||
@@ -251,6 +251,7 @@ public class DeclaredRecordManage { | |||||
item.setReviewAmount(w.getReviewAmount()); | item.setReviewAmount(w.getReviewAmount()); | ||||
item.setApprovedAmount(w.getApprovalAmount()); | item.setApprovedAmount(w.getApprovalAmount()); | ||||
item.setCreateTime(w.getCreateOn()); | item.setCreateTime(w.getCreateOn()); | ||||
item.setProjectYear(w.getProjectYear()); | |||||
ProjectStatus status = getDeclaredRecordStatus(w.getStatus()); | ProjectStatus status = getDeclaredRecordStatus(w.getStatus()); | ||||
item.setStatus(status.getCode()); | item.setStatus(status.getCode()); | ||||
item.setStage(status.getStage()); | item.setStage(status.getStage()); | ||||
@@ -17,6 +17,9 @@ import java.time.LocalDateTime; | |||||
@Data | @Data | ||||
public class DeclaredProjectListVO { | public class DeclaredProjectListVO { | ||||
@ApiModelProperty("项目年份") | |||||
private Integer projectYear; | |||||
@ApiModelProperty("项目名称") | @ApiModelProperty("项目名称") | ||||
private String projectName; | private String projectName; | ||||