diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java index da70263..f4db542 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java @@ -56,8 +56,8 @@ public class OpenApiProjectLibManage { sql.append(String.format(" and npsc.create_on >= '%s'", BizDateUtil.toDateStr(po.getReviewPassTime()))); } Wrapper query = Wrappers.lambdaQuery(Project.class) - .select(Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode, - Project::getProjectYear, Project::getCreateOn, Project::getBuildOrgName) + .select(Project::getId, Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode, Project::getStatus, + Project::getDeclareAmount, Project::getProjectYear, Project::getCreateOn, Project::getBuildOrgName) .exists(sql.toString()) .eq(Project::getNewest, Boolean.TRUE) .notIn(Project::getStage, ProjectStatus.CHANGE.getCode(), ProjectStatus.STOPPED.getCode()) @@ -90,6 +90,9 @@ public class OpenApiProjectLibManage { item.setProjectName(w.getProjectName()); item.setBuildOrgCode(w.getBuildOrgCode()); item.setBuildOrgName(w.getBuildOrgName()); + item.setDeclareAmount(w.getDeclareAmount()); + item.setStatus(w.getStatus()); + item.setId(w.getId()); List replaceInfoList = replaceInfoMap.get(w.getProjectCode()); if (replaceInfoList != null) { List referSystemList = CollUtils.convert(replaceInfoList, diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java index 41094ff..34a91bd 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java @@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; /** *

- * ProjectInfoToMhVO + * ReviewPassProjectInfoToMhVO *

* * @author WendyYang @@ -37,6 +38,15 @@ public class ReviewPassProjectInfoToMhVO { @ApiModelProperty("建设单位名称") private String buildOrgName; + @ApiModelProperty("申报金额") + private BigDecimal declareAmount; + + @ApiModelProperty("项目状态") + private Integer status; + + @ApiModelProperty("项目ID") + private Long id; + @ApiModelProperty("项目系统列表") private List referSystemList;