@@ -727,6 +727,7 @@ public class PurchaseManage { | |||||
.select(Project::getId) | .select(Project::getId) | ||||
.ne(Project::getStage, ProjectStatus.STOPPED.getCode()) | .ne(Project::getStage, ProjectStatus.STOPPED.getCode()) | ||||
.eq(Project::getNewest, Boolean.TRUE) | .eq(Project::getNewest, Boolean.TRUE) | ||||
.eq(req.getProjectYear() != null, Project::getProjectYear, req.getProjectYear()) | |||||
.like(StrUtil.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName()) | .like(StrUtil.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName()) | ||||
.like(StrUtil.isNotBlank(req.getBuildOrgName()), Project::getBuildOrgName, req.getBuildOrgName()); | .like(StrUtil.isNotBlank(req.getBuildOrgName()), Project::getBuildOrgName, req.getBuildOrgName()); | ||||
if (req.getBuildOrgCode() != null) { | if (req.getBuildOrgCode() != null) { | ||||
@@ -21,6 +21,9 @@ import java.time.LocalDateTime; | |||||
@EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
public class PurchaseAdaptionListReq extends PagePo { | public class PurchaseAdaptionListReq extends PagePo { | ||||
@ApiModelProperty("项目年份") | |||||
private Integer projectYear; | |||||
private String bidName; | private String bidName; | ||||
@ApiModelProperty("建设单位") | @ApiModelProperty("建设单位") | ||||
@@ -46,7 +49,8 @@ public class PurchaseAdaptionListReq extends PagePo { | |||||
public boolean hasProjectQuery() { | public boolean hasProjectQuery() { | ||||
return StrUtil.isNotBlank(this.buildOrgName) | return StrUtil.isNotBlank(this.buildOrgName) | ||||
|| StrUtil.isNotBlank(this.projectName) | || StrUtil.isNotBlank(this.projectName) | ||||
|| this.buildOrgCode != null; | |||||
|| this.buildOrgCode != null | |||||
|| this.projectYear != null; | |||||
} | } | ||||
} | } |
@@ -188,6 +188,7 @@ public class DeclaredRecordManage { | |||||
private LambdaQueryWrapper<Project> buildDeclaredRecordQuery(DeclaredProjectListReq req) { | private LambdaQueryWrapper<Project> buildDeclaredRecordQuery(DeclaredProjectListReq req) { | ||||
LambdaQueryWrapper<Project> query = Wrappers.lambdaQuery(Project.class) | LambdaQueryWrapper<Project> query = Wrappers.lambdaQuery(Project.class) | ||||
.eq(req.getProjectYear() != null, Project::getProjectYear, req.getProjectYear()) | |||||
.like(StrUtil.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName()) | .like(StrUtil.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName()) | ||||
.like(StrUtil.isNotBlank(req.getDeclaredUnit()), Project::getBuildOrgName, req.getDeclaredUnit()) | .like(StrUtil.isNotBlank(req.getDeclaredUnit()), Project::getBuildOrgName, req.getDeclaredUnit()) | ||||
.eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) | .eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) | ||||
@@ -19,6 +19,9 @@ import java.time.LocalDate; | |||||
@EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
public class DeclaredProjectListReq extends PagePo { | public class DeclaredProjectListReq extends PagePo { | ||||
@ApiModelProperty("项目年份") | |||||
private Integer projectYear; | |||||
@ApiModelProperty("项目名称") | @ApiModelProperty("项目名称") | ||||
private String projectName; | private String projectName; | ||||