|
@@ -745,6 +745,9 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
|
|
|
}
|
|
|
}
|
|
|
expenseSheet.setInvoiceList(list);
|
|
|
+ if (expenseSheet.getType()!=null){
|
|
|
+ expenseSheet.setExpenseMainTypeName(expenseMainTypeService.getById(expenseSheet.getType()).getName());
|
|
|
+ }
|
|
|
double amount = list.stream().mapToDouble(item -> Optional.ofNullable(item.getAmount()).orElse(0.0)).sum();
|
|
|
expenseSheet.setTotalAmount(amount);
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|