From 4131196f712eff02ec9bec557d31abc396676a1d Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 9 Aug 2023 15:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=A2=84=E7=AE=97=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/service/impl/BirCenterRateServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index c0560363..8829bd5e 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.SpringUtils; import com.qs.serve.modules.bir.entity.BirActivityCenterGoods; @@ -26,6 +27,7 @@ import com.qs.serve.modules.tbs.common.util.QuarterUtil; import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import com.qs.serve.modules.tbs.mapper.TbsActivityCenterMapper; +import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper; import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; import com.qs.serve.modules.tzc.entity.TzcPolicyItem; @@ -58,7 +60,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { private BirActivityCenterGoodsMapper birActivityCenterGoodsMapper; private TbsActivityCenterMapper tbsActivityCenterMapper; private TzcPolicyItemMapper tzcPolicyItemMapper; - + private TbsBudgetLogMapper tbsBudgetLogMapper; public List findCostCenterDataByCostApplyId(Long costApplyId,Long policyId){ List centerDataList = new ArrayList<>(); @@ -124,10 +126,17 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { scheduleItemBudgetLambdaQueryWrapper.in(TbsScheduleItemBudget::getBudgetId,tbsBudgetList.stream().map(a->a.getId()).collect(Collectors.toList())); List scheduleItemBudgetList = tbsScheduleItemBudgetMapper.selectList(scheduleItemBudgetLambdaQueryWrapper); //合计目标发货和金定额 - BigDecimal targetBudgetAmout = scheduleItemBudgetList.stream().map(a->a.getBudgetAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); BigDecimal targetDispatchAmout = scheduleItemBudgetList.stream().map(a->a.getPreDispatchAmount()==null?BigDecimal.ZERO:a.getPreDispatchAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); costCenter.setTargetSales(targetDispatchAmout.toString()); + + LambdaQueryWrapper tbsbudgetLogLambdaQueryWrapper = new LambdaQueryWrapper(); + tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterId,centerId); + tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterType,centerType); + tbsbudgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); + List logList = tbsBudgetLogMapper.selectList(tbsbudgetLogLambdaQueryWrapper); + BigDecimal targetBudgetAmout = logList.stream().map(a->a.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); costCenter.setAreaBudget(targetBudgetAmout.toString()); + BigDecimal targetExpenseRate = BigDecimal.ZERO; if(targetDispatchAmout.compareTo(BigDecimal.ZERO)!=0) { targetExpenseRate = targetBudgetAmout.divide(targetDispatchAmout, 2, BigDecimal.ROUND_HALF_DOWN);