Browse Source

feat:

1. 复核通过项目同步接口增加项目名称、状态、ID;
master
WendyYang 2 weeks ago
parent
commit
dae4efc65d
2 changed files with 16 additions and 3 deletions
  1. +5
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java
  2. +11
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java

+ 5
- 2
hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java View File

@@ -56,8 +56,8 @@ public class OpenApiProjectLibManage {
sql.append(String.format(" and npsc.create_on >= '%s'", BizDateUtil.toDateStr(po.getReviewPassTime())));
}
Wrapper<Project> 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<MhSystemReplaceInfo> replaceInfoList = replaceInfoMap.get(w.getProjectCode());
if (replaceInfoList != null) {
List<ReferSystemReplaceInfoToMhVO> referSystemList = CollUtils.convert(replaceInfoList,


+ 11
- 1
hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java View File

@@ -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;

/**
* <p>
* ProjectInfoToMhVO
* ReviewPassProjectInfoToMhVO
* </p>
*
* @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<ReferSystemReplaceInfoToMhVO> referSystemList;



Loading…
Cancel
Save