|
|
@ -308,9 +308,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { |
|
|
|
result.forEach(r -> { |
|
|
|
finalEndCategoryList.stream().filter(e -> r.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> { |
|
|
|
r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio()); |
|
|
|
r.setProjectTotal(e.getProjectTotal()); |
|
|
|
r.setClosedProjectTotal(e.getClosedProjectTotal()); |
|
|
|
}); |
|
|
|
r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> { |
|
|
|
son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio()); |
|
|
|
son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal()); |
|
|
|
})); |
|
|
|
}); |
|
|
|
// 排序
|
|
|
|