Browse Source

modify:

1. 修改项目列表查询;
tags/24082301
WendyYang 4 months ago
parent
commit
5eea827e20
4 changed files with 7 additions and 4 deletions
  1. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java
  2. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java
  3. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java
  4. +4
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

+ 1
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java View File

@@ -146,7 +146,7 @@ public class EditPurchaseDTO {
private BigDecimal bidPayAmount;

@ApiModelProperty("采购时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate purchaseDate;

@ApiModelProperty("是否发布信创云图")


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

@@ -48,7 +48,7 @@ public class SubmitPurchaseNoticeReq {
private BigDecimal bidPayAmount;

@ApiModelProperty("采购时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate purchaseDate;

@ApiModelProperty("开标时间")


+ 1
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java View File

@@ -195,7 +195,7 @@ public class ProjectDTO implements Serializable {
@ApiModelProperty("批复-政府投资-上级补助资金(万元)")
private BigDecimal approvalGovSuperiorFinanceAmount;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime annualPlanAddTime;

@ApiModelProperty("核心业务-核心业务模块")


+ 4
- 1
hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java View File

@@ -518,6 +518,10 @@ public class WorkbenchManage {
Long unitId = Optional.ofNullable(req.getUnitId()).orElseGet(LoginUserUtil::getMhUnitId);
List<Long> viewUnitIds = mhUnitCache.getViewChildIdsRecursion(unitId);
LambdaQueryWrapper<Project> query = Wrappers.lambdaQuery(Project.class)
.select(Project::getId, Project::getStage, Project::getStatus, Project::getProjectCode,
Project::getBuildOrgCode, Project::getBuildOrgName, Project::getApprovalAmount,
Project::getCreateOn, Project::getProjectName, Project::getProjectYear,
Project::getDeclareAmount, Project::getReviewAmount)
.eq(req.getProjectYear() != null, Project::getProjectYear, req.getProjectYear())
.like(StrUtil.isNotBlank(req.getBuildOrg()), Project::getBuildOrgName, req.getBuildOrg())
.like(StrUtil.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName())
@@ -573,7 +577,6 @@ public class WorkbenchManage {
.projectYear(w.getProjectYear())
.buildOrg(w.getBuildOrgName())
.buildOrgCode(w.getBuildOrgCode())
.bizDomain(w.getBizDomain())
.approvedAmount(w.getApprovalAmount())
.reviewAmount(w.getReviewAmount())
.declaredAmount(w.getDeclareAmount())


Loading…
Cancel
Save