Sfoglia il codice sorgente

feat:

1. 首页增加申报总金额;
tags/24112201
WendyYang 1 mese fa
parent
commit
d7d25e0762
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. +3
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java
  2. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java

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

@@ -212,7 +212,8 @@ public class WorkbenchManage {
initWorkbenchDefaultParam(req);
LambdaQueryWrapper<Project> 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<Project> 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));


+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectTotalViewVO.java Vedi File

@@ -26,6 +26,9 @@ public class ProjectTotalViewVO {
@ApiModelProperty("替代后系统总数")
private Integer totalTargetSystemCount;

@ApiModelProperty("申报总金额")
private BigDecimal totalDeclareAmount;

@ApiModelProperty("评审金额")
private BigDecimal totalReviewAmount;



Loading…
Annulla
Salva