Browse Source

modify:

1. 项目立项增加年度查询;
dev
WendyYang 19 hours ago
parent
commit
0918d6c06c
4 changed files with 10 additions and 1 deletions
  1. +1
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
  2. +5
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/PurchaseAdaptionListReq.java
  3. +1
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
  4. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/DeclaredProjectListReq.java

+ 1
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java View File

@@ -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) {


+ 5
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/PurchaseAdaptionListReq.java View File

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


} }

+ 1
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java View File

@@ -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())


+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/DeclaredProjectListReq.java View File

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




Loading…
Cancel
Save