Browse Source

modify:

1. 项目金额列表统计修改;
tags/24082301^0
WendyYang 4 months ago
parent
commit
52c9c02b47
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

+ 4
- 2
hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java View File

@@ -279,8 +279,10 @@ public class WorkbenchManage {
Collectors.collectingAndThen(Collectors.toList(),
w -> {
Set<String> sourceNames = CollUtils.fieldSet(w, ProjectGovSystemReplaceInfos::getSourceSystem);
int sourceCount = CollUtil.count(sourceNames, isValidSystem::test);
Set<String> targetNames = CollUtils.fieldSet(w, ProjectGovSystemReplaceInfos::getTargetSystem);
return Pair.create(sourceNames.size(), targetNames.size());
int targetCount = CollUtil.count(targetNames, isValidSystem::test);
return Pair.create(sourceCount, targetCount);
}))).values();
int totalTargetCount = 0;
int totalSourceCount = 0;
@@ -528,7 +530,7 @@ public class WorkbenchManage {
.le(req.getReviewAmountMax() != null, Project::getReviewAmount, req.getReviewAmountMax())
// 下达金额
.ge(req.getApproveAmountMin() != null, Project::getApprovalAmount, req.getApproveAmountMin())
.ge(req.getApproveAmountMax() != null, Project::getApprovalAmount, req.getApproveAmountMax())
.le(req.getApproveAmountMax() != null, Project::getApprovalAmount, req.getApproveAmountMax())
.eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip())
.eq(Project::getNewest, Boolean.TRUE)
.orderByDesc(Project::getUpdateOn);


Loading…
Cancel
Save