Skip to content
Snippets Groups Projects

预算调整-跳入项目优化

Merged 王星君 requested to merge feature/shangliwxj into release/shangli
Compare and
1 file
+ 12
14
Compare changes
  • Side-by-side
  • Inline
@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.TreeSet;
import java.util.stream.Collectors;
@Service
@@ -65,10 +67,7 @@ public class ProjectcInfoQueryServiceImpl implements ProjectInfoQueryService {
}
}
}
if (ObjectUtils.isNotEmpty(projectBudgetData)) {
projectBudgetData = filterProjectBudgetData(projectBudgetData);
}
projectBudgetData = filterProjectBudgetData(projectBudgetData);
return projectBudgetData;
}
@@ -79,13 +78,14 @@ public class ProjectcInfoQueryServiceImpl implements ProjectInfoQueryService {
* @return {@link List}<{@link ProjectBudgetData}>
*/
public List<ProjectBudgetData> filterProjectBudgetData(List<ProjectBudgetData> projectBudgetData) {
//过滤金额小于等于零的项目
List<ProjectBudgetData> collect = projectBudgetData.stream().filter(p -> p.getUsedAmount().compareTo(BigDecimal.valueOf(0)) > 0).collect(Collectors.toList());
if (ObjectUtils.isNotEmpty(collect)) {
//删除3开头的项目
collect.removeIf(p -> p.getProjectCode().startsWith("3"));
}
return collect;
//过滤金额小于等于零的项目并删除3开头的项目
List<ProjectBudgetData> collect =
projectBudgetData.stream().filter
(p -> p.getUsedAmount().compareTo(BigDecimal.valueOf(0)) > 0 && !p.getProjectCode().startsWith("3"))
.collect(Collectors.toList());
return collect.stream().collect(
Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
Comparator.comparing(ProjectBudgetData::getProjectCode))),ArrayList::new));
}
/**
@@ -99,9 +99,7 @@ public class ProjectcInfoQueryServiceImpl implements ProjectInfoQueryService {
if (StringUtils.isNotBlank(businessProjectQry.getFilterProjectCode())) {
projectBudgetData = StreamUtils.filterList(projectBudgetData,item->!item.getProjectCode().equals(businessProjectQry.getFilterProjectCode()));
}
if (ObjectUtils.isNotEmpty(projectBudgetData)) {
projectBudgetData = filterProjectBudgetData(projectBudgetData);
}
projectBudgetData = filterProjectBudgetData(projectBudgetData);
return projectBudgetData;
}