|
@@ -56,8 +56,8 @@ public class OpenApiProjectLibManage { |
|
|
sql.append(String.format(" and npsc.create_on >= '%s'", BizDateUtil.toDateStr(po.getReviewPassTime()))); |
|
|
sql.append(String.format(" and npsc.create_on >= '%s'", BizDateUtil.toDateStr(po.getReviewPassTime()))); |
|
|
} |
|
|
} |
|
|
Wrapper<Project> query = Wrappers.lambdaQuery(Project.class) |
|
|
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()) |
|
|
.exists(sql.toString()) |
|
|
.eq(Project::getNewest, Boolean.TRUE) |
|
|
.eq(Project::getNewest, Boolean.TRUE) |
|
|
.notIn(Project::getStage, ProjectStatus.CHANGE.getCode(), ProjectStatus.STOPPED.getCode()) |
|
|
.notIn(Project::getStage, ProjectStatus.CHANGE.getCode(), ProjectStatus.STOPPED.getCode()) |
|
@@ -90,6 +90,9 @@ public class OpenApiProjectLibManage { |
|
|
item.setProjectName(w.getProjectName()); |
|
|
item.setProjectName(w.getProjectName()); |
|
|
item.setBuildOrgCode(w.getBuildOrgCode()); |
|
|
item.setBuildOrgCode(w.getBuildOrgCode()); |
|
|
item.setBuildOrgName(w.getBuildOrgName()); |
|
|
item.setBuildOrgName(w.getBuildOrgName()); |
|
|
|
|
|
item.setDeclareAmount(w.getDeclareAmount()); |
|
|
|
|
|
item.setStatus(w.getStatus()); |
|
|
|
|
|
item.setId(w.getId()); |
|
|
List<MhSystemReplaceInfo> replaceInfoList = replaceInfoMap.get(w.getProjectCode()); |
|
|
List<MhSystemReplaceInfo> replaceInfoList = replaceInfoMap.get(w.getProjectCode()); |
|
|
if (replaceInfoList != null) { |
|
|
if (replaceInfoList != null) { |
|
|
List<ReferSystemReplaceInfoToMhVO> referSystemList = CollUtils.convert(replaceInfoList, |
|
|
List<ReferSystemReplaceInfoToMhVO> referSystemList = CollUtils.convert(replaceInfoList, |
|
|