|
|
@@ -1,16 +1,13 @@ |
|
|
|
package com.hz.pm.api.open.manage; |
|
|
|
|
|
|
|
import cn.hutool.core.date.DatePattern; |
|
|
|
import cn.hutool.core.date.LocalDateTimeUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.hz.pm.api.common.model.constant.ExistsSqlConst; |
|
|
|
import com.hz.pm.api.common.util.BizDateUtil; |
|
|
|
import com.hz.pm.api.common.util.BizUtils; |
|
|
|
import com.hz.pm.api.open.model.po.ReviewPassProjectListPO; |
|
|
|
import com.hz.pm.api.open.model.vo.ReviewPassProjectInfoToMhVO; |
|
|
|
import com.hz.pm.api.open.model.vo.ReferSystemReplaceInfoToMhVO; |
|
|
|
import com.hz.pm.api.open.model.vo.ReviewPassProjectInfoToMhVO; |
|
|
|
import com.hz.pm.api.open.util.OpenApiCheckSignUtil; |
|
|
|
import com.hz.pm.api.projectlib.entity.MhSystemReplaceInfo; |
|
|
|
import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos; |
|
|
@@ -59,7 +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::getBuildOrgName) |
|
|
|
.select(Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode, |
|
|
|
Project::getProjectYear, Project::getCreateOn, Project::getBuildOrgName) |
|
|
|
.exists(sql.toString()) |
|
|
|
.eq(Project::getNewest, Boolean.TRUE) |
|
|
|
.notIn(Project::getStage, ProjectStatus.CHANGE.getCode(), ProjectStatus.STOPPED.getCode()) |
|
|
@@ -86,6 +84,8 @@ public class OpenApiProjectLibManage { |
|
|
|
|
|
|
|
return projects.stream().map(w -> { |
|
|
|
ReviewPassProjectInfoToMhVO item = new ReviewPassProjectInfoToMhVO(); |
|
|
|
item.setCreateOn(w.getCreateOn()); |
|
|
|
item.setProjectYear(w.getProjectYear()); |
|
|
|
item.setProjectCode(w.getProjectCode()); |
|
|
|
item.setProjectName(w.getProjectName()); |
|
|
|
item.setBuildOrgCode(w.getBuildOrgCode()); |
|
|
|