diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java index 88684103..3638da53 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java @@ -59,6 +59,13 @@ public class BmsChannel implements Serializable { @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; + + /** 可投放费用标识 */ + private Integer costFlag; + + /** 总公司渠道 */ + private String headChannel; + /** 所属租户 */ @JsonIgnore @JsonProperty @@ -77,8 +84,6 @@ public class BmsChannel implements Serializable { @TableField(fill = FieldFill.UPDATE) private String updateBy; - /** 可投放费用标识 */ - private Integer costFlag; /** 值=1,过滤当前用户及下属负责数据 */ @TableField(exist = false) diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index e2ff835b..085adf7f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -429,13 +429,16 @@ public class TbsBudgetServiceImpl extends ServiceImpl LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); lqw2.eq(TbsScheduleItemBudget::getBudgetId,budget.getId()); List scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); - scheduleItemBudgets.forEach(a->{ - LambdaQueryWrapper budgetLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); - budgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); - budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId,a.getId()); - List logList = budgetLogService.list(budgetLogLambdaQueryWrapper); - a.setBudgetAmount(logList.stream().map(b->b.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add)); - }); + if(budgetVo.getBudgetState().equals(1)) { + //已开启才计算 + scheduleItemBudgets.forEach(a -> { + LambdaQueryWrapper budgetLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); + budgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); + budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId, a.getId()); + List logList = budgetLogService.list(budgetLogLambdaQueryWrapper); + a.setBudgetAmount(logList.stream().map(b -> b.getAmount()).reduce(BigDecimal.ZERO, BigDecimal::add)); + }); + } budgetVo.setScheduleItem(scheduleItemBudgets); if(CollectionUtil.isNotEmpty(budget.getAttachIds())){