From 5eea827e207906084fc450a6b489729b5ad4fd15 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 23 Aug 2024 16:00:10 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java | 2 +- .../hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java | 2 +- .../src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java | 2 +- .../main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java index 06facbd..35faa30 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditPurchaseDTO.java @@ -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("是否发布信创云图") diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java index 351b114..9f8af6a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java @@ -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("开标时间") diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java index 101752c..af072d2 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java @@ -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("核心业务-核心业务模块") diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index ee25158..8dc6e22 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -518,6 +518,10 @@ public class WorkbenchManage { Long unitId = Optional.ofNullable(req.getUnitId()).orElseGet(LoginUserUtil::getMhUnitId); List viewUnitIds = mhUnitCache.getViewChildIdsRecursion(unitId); LambdaQueryWrapper 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())