|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.ningdatech.basic.model.PageVo; |
|
|
import com.ningdatech.basic.model.PageVo; |
|
|
|
|
|
import com.ningdatech.pmapi.common.enumeration.CommonEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; |
|
|
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; |
|
@@ -56,6 +57,8 @@ public class IrsProjectManage { |
|
|
.like(StringUtils.isNotBlank(req.getProjectName()),Project::getProjectName,req.getProjectName()) |
|
|
.like(StringUtils.isNotBlank(req.getProjectName()),Project::getProjectName,req.getProjectName()) |
|
|
.like(StringUtils.isNotBlank(req.getBuildOrgName()),Project::getBuildOrgName,req.getBuildOrgName()) |
|
|
.like(StringUtils.isNotBlank(req.getBuildOrgName()),Project::getBuildOrgName,req.getBuildOrgName()) |
|
|
.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()) |
|
|
.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()) |
|
|
|
|
|
.eq(Project::getNewest,Boolean.TRUE) |
|
|
|
|
|
.eq(Project::getIncludeApplication, CommonEnum.YES.getCode()) |
|
|
.orderByDesc(Project::getUpdateOn); |
|
|
.orderByDesc(Project::getUpdateOn); |
|
|
buildPermission(wrapper,user); |
|
|
buildPermission(wrapper,user); |
|
|
projectService.page(page,wrapper); |
|
|
projectService.page(page,wrapper); |
|
|