|
@@ -2181,6 +2181,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
List<Integer> collect = sheetList.stream().map(ExpenseSheet::getId).distinct().collect(Collectors.toList());
|
|
List<Integer> collect = sheetList.stream().map(ExpenseSheet::getId).distinct().collect(Collectors.toList());
|
|
collect.add(-1);
|
|
collect.add(-1);
|
|
double sum = expenseItemList.stream().filter(el -> collect.contains(el.getExpenseId())&&el.getProjectId()!=null&&el.getProjectId().equals(map.get("id"))).mapToDouble(el -> el.getAmount()==null?0:el.getAmount()).sum();
|
|
double sum = expenseItemList.stream().filter(el -> collect.contains(el.getExpenseId())&&el.getProjectId()!=null&&el.getProjectId().equals(map.get("id"))).mapToDouble(el -> el.getAmount()==null?0:el.getAmount()).sum();
|
|
|
|
+ sum = Double.parseDouble(df.format(sum));
|
|
item.put("amount",sum);
|
|
item.put("amount",sum);
|
|
itemList.add(item);
|
|
itemList.add(item);
|
|
map.put(expenseMainType.getName(),sum);
|
|
map.put(expenseMainType.getName(),sum);
|
|
@@ -2257,6 +2258,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
List<Integer> collect = sheetList.stream().map(ExpenseSheet::getId).distinct().collect(Collectors.toList());
|
|
List<Integer> collect = sheetList.stream().map(ExpenseSheet::getId).distinct().collect(Collectors.toList());
|
|
collect.add(-1);
|
|
collect.add(-1);
|
|
double sum = expenseItemList.stream().filter(el -> collect.contains(el.getExpenseId())&&el.getProjectId()!=null&&el.getProjectId().equals(item.get("id"))).mapToDouble(el -> el.getAmount()==null?0:el.getAmount()).sum();
|
|
double sum = expenseItemList.stream().filter(el -> collect.contains(el.getExpenseId())&&el.getProjectId()!=null&&el.getProjectId().equals(item.get("id"))).mapToDouble(el -> el.getAmount()==null?0:el.getAmount()).sum();
|
|
|
|
+ sum = Double.parseDouble(df.format(sum));
|
|
it.put("amount",sum);
|
|
it.put("amount",sum);
|
|
data.add(String.valueOf(sum));
|
|
data.add(String.valueOf(sum));
|
|
bigDecimal=bigDecimal.add(new BigDecimal(sum));
|
|
bigDecimal=bigDecimal.add(new BigDecimal(sum));
|