diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml index ef954f1..b550e0b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml @@ -26,8 +26,8 @@ and p.project_type = #{param.projectType} - - and p.project_year = #{param.projectYear} + + and p.project_year = #{param.year} and p.stage = #{param.stage} @@ -35,11 +35,11 @@ and p.status = #{param.status} - - and p.create_on >= #{param.createOnMin} + + and p.create_on >= #{param.startTime} - - and p.create_on <= #{param.createOnMax} + + and p.create_on <= #{param.endTime} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java index 2dd6409..486fa9f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java @@ -32,7 +32,7 @@ public class ProjectRenewalListReq extends PagePo { private Integer projectType; @ApiModelProperty("预算年度") - private Integer projectYear; + private Integer year; @ApiModelProperty("项目阶段") private Integer stage; @@ -42,11 +42,11 @@ public class ProjectRenewalListReq extends PagePo { @ApiModelProperty("创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - private LocalDateTime createOnMin; + private LocalDateTime startTime; @ApiModelProperty("创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - private LocalDateTime createOnMax; + private LocalDateTime endTime; @ApiModelProperty("用户ID") private Long userId;