From d7d25e07627bf854fd28b066c82df4684f2180b3 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 22 Nov 2024 16:13:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E9=A6=96=E9=A1=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=B3=E6=8A=A5=E6=80=BB=E9=87=91=E9=A2=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java | 4 +++- .../java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 44d2c82..cd03c56 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 @@ -212,7 +212,8 @@ public class WorkbenchManage { initWorkbenchDefaultParam(req); LambdaQueryWrapper projectQuery = Wrappers.lambdaQuery(Project.class) .select(Project::getReviewAmount, Project::getApprovalAmount, Project::getId, Project::getStage, - Project::getApprovalGovOwnFinanceAmount, Project::getApprovalGovSuperiorFinanceAmount) + Project::getApprovalGovOwnFinanceAmount, Project::getApprovalGovSuperiorFinanceAmount, + Project::getDeclareAmount) .eq(Project::getProjectYear, req.getProjectYear()) .eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) .ne(Project::getStatus, ProjectStatus.CHANGE_APPLY_PASSED.getCode()) @@ -225,6 +226,7 @@ public class WorkbenchManage { } List validProjects = CollUtils.filter(projects, w -> !ProjectStatus.STOPPED.eq(w.getStage())); retDetail.setTotalApprovalAmount(DecimalUtil.sum(validProjects, Project::getApprovalAmount)); + retDetail.setTotalDeclareAmount(DecimalUtil.sum(validProjects, Project::getDeclareAmount)); retDetail.setTotalReviewAmount(DecimalUtil.sum(validProjects, Project::getReviewAmount)); retDetail.setCurrOrgApprovalAmount(DecimalUtil.sum(validProjects, Project::getApprovalGovOwnFinanceAmount)); retDetail.setUpperOrgApprovalAmount(DecimalUtil.sum(validProjects, Project::getApprovalGovSuperiorFinanceAmount)); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java index 69e377d..22b22e5 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java @@ -26,6 +26,9 @@ public class ProjectTotalViewVO { @ApiModelProperty("替代后系统总数") private Integer totalTargetSystemCount; + @ApiModelProperty("申报总金额") + private BigDecimal totalDeclareAmount; + @ApiModelProperty("评审金额") private BigDecimal totalReviewAmount;