|
|
@@ -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)); |
|
|
|