Browse Source

微调渠道字段,修复预算显示BUG

v1.0
15989082884@163.com 2 years ago
parent
commit
02f1f937b9
  1. 9
      src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java
  2. 9
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

9
src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java

@ -59,6 +59,13 @@ public class BmsChannel implements Serializable {
@TableField(fill = FieldFill.UPDATE) @TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** 可投放费用标识 */
private Integer costFlag;
/** 总公司渠道 */
private String headChannel;
/** 所属租户 */ /** 所属租户 */
@JsonIgnore @JsonIgnore
@JsonProperty @JsonProperty
@ -77,8 +84,6 @@ public class BmsChannel implements Serializable {
@TableField(fill = FieldFill.UPDATE) @TableField(fill = FieldFill.UPDATE)
private String updateBy; private String updateBy;
/** 可投放费用标识 */
private Integer costFlag;
/** 值=1,过滤当前用户及下属负责数据 */ /** 值=1,过滤当前用户及下属负责数据 */
@TableField(exist = false) @TableField(exist = false)

9
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@ -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())){

Loading…
Cancel
Save