|
@ -429,13 +429,16 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget> |
|
|
LambdaQueryWrapper<TbsScheduleItemBudget> lqw2 = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<TbsScheduleItemBudget> lqw2 = new LambdaQueryWrapper<>(); |
|
|
lqw2.eq(TbsScheduleItemBudget::getBudgetId,budget.getId()); |
|
|
lqw2.eq(TbsScheduleItemBudget::getBudgetId,budget.getId()); |
|
|
List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); |
|
|
List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); |
|
|
scheduleItemBudgets.forEach(a->{ |
|
|
if(budgetVo.getBudgetState().equals(1)) { |
|
|
|
|
|
//已开启才计算
|
|
|
|
|
|
scheduleItemBudgets.forEach(a -> { |
|
|
LambdaQueryWrapper<TbsBudgetLog> budgetLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<TbsBudgetLog> budgetLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
budgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); |
|
|
budgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); |
|
|
budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId,a.getId()); |
|
|
budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId, a.getId()); |
|
|
List<TbsBudgetLog> logList = budgetLogService.list(budgetLogLambdaQueryWrapper); |
|
|
List<TbsBudgetLog> logList = budgetLogService.list(budgetLogLambdaQueryWrapper); |
|
|
a.setBudgetAmount(logList.stream().map(b->b.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add)); |
|
|
a.setBudgetAmount(logList.stream().map(b -> b.getAmount()).reduce(BigDecimal.ZERO, BigDecimal::add)); |
|
|
}); |
|
|
}); |
|
|
|
|
|
} |
|
|
budgetVo.setScheduleItem(scheduleItemBudgets); |
|
|
budgetVo.setScheduleItem(scheduleItemBudgets); |
|
|
|
|
|
|
|
|
if(CollectionUtil.isNotEmpty(budget.getAttachIds())){ |
|
|
if(CollectionUtil.isNotEmpty(budget.getAttachIds())){ |
|
|