modify:

1. 首页金额统计修改，增加本级、上级下达金额；

hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

@@ -187,7 +187,8 @@ public class WorkbenchManage {
         ProjectTotalViewVO retDetail = new ProjectTotalViewVO();
         initWorkbenchDefaultParam(req);
         LambdaQueryWrapper<Project> projectQuery = Wrappers.lambdaQuery(Project.class)
-                .select(Project::getReviewAmount, Project::getApprovalAmount, Project::getId)
+                .select(Project::getReviewAmount, Project::getApprovalAmount, Project::getId,
+                        Project::getApprovalGovOwnFinanceAmount,Project::getApprovalGovSuperiorFinanceAmount)
                 .eq(Project::getProjectYear, req.getProjectYear())
                 .eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip())
                 .eq(Project::getNewest, Boolean.TRUE);
@@ -197,10 +198,10 @@ public class WorkbenchManage {
         if (projects.isEmpty()) {
             return retDetail;
         }
-        BigDecimal approvalAmount = DecimalUtil.sum(projects, Project::getApprovalAmount);
-        BigDecimal reviewAmount = DecimalUtil.sum(projects, Project::getReviewAmount);
-        retDetail.setTotalApprovalAmount(approvalAmount);
-        retDetail.setTotalReviewAmount(reviewAmount);
+        retDetail.setTotalApprovalAmount(DecimalUtil.sum(projects, Project::getApprovalAmount));
+        retDetail.setTotalReviewAmount(DecimalUtil.sum(projects, Project::getReviewAmount));
+        retDetail.setCurrOrgApprovalAmount(DecimalUtil.sum(projects, Project::getApprovalGovOwnFinanceAmount));
+        retDetail.setUpperOrgApprovalAmount(DecimalUtil.sum(projects, Project::getApprovalGovSuperiorFinanceAmount));
         List<Long> projectIds = CollUtils.fieldList(projects, Project::getId);
         // 合同金额
         List<Contract> contracts = contractService.list(Wrappers.lambdaQuery(Contract.class)

hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java

@@ -32,6 +32,12 @@ public class ProjectTotalViewVO {
     @ApiModelProperty("下达金额")
     private BigDecimal totalApprovalAmount;
 
+    @ApiModelProperty("当前组织下达金额")
+    private BigDecimal currOrgApprovalAmount;
+
+    @ApiModelProperty("上级组织下达金额")
+    private BigDecimal upperOrgApprovalAmount;
+
     @ApiModelProperty("合同金额")
     private BigDecimal totalContractAmount;