From 02f1f937b90674d4721d7f4930caf6242c1e32d8 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Tue, 1 Aug 2023 10:26:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=B8=A0=E9=81=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=AE=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/bms/entity/BmsChannel.java | 9 +++++++-- .../tbs/service/impl/TbsBudgetServiceImpl.java | 17 ++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) 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())){