diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java index 7296c336..673df602 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java @@ -72,5 +72,7 @@ public interface TbsCostApplyService extends IService { */ void flushCostStatus(Long costApplyId,boolean isContractFlag); + void buildMainData4ROI(TbsCostApply tbsCostApply, Map data); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 87f54f6f..008529ba 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -965,7 +965,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl data) { + public void buildMainData4ROI(TbsCostApply tbsCostApply, Map data) { YtdQtdToOAVo ytdQtdToOAVo = birRoiRateService.buildYtdAndQtdData(tbsCostApply); data.put("ytdCusExpenseRate",ytdQtdToOAVo.getYtdCustomerPercent()==null? "0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+""); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index a0eff9db..0a00fc95 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -823,23 +823,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl costPercentLambdaQueryWrapper = new LambdaQueryWrapper<>(); - costPercentLambdaQueryWrapper.eq(TbsCostPercent::getCostApplyId, activity.getCostApplyId()); - List costPercentList = costPercentMapper.selectList(costPercentLambdaQueryWrapper); - if(costPercentList.size()>0){ - TbsCostPercent costPercent = costPercentList.get(0); - data.put("ytdCusExpenseRate",costPercent.getYtdCustomerPercent()); - data.put("ytdEmpExpenseRate",costPercent.getYtdUserPercent()); - data.put("ytdAdminiExpenseRate",costPercent.getYtdRegionPercent()); - data.put("ytdSalesExpenseRate",costPercent.getYtdRegion2Percent()); - data.put("cusExpenseRate",costPercent.getQtdCustomerPercent()); - data.put("empExpenseRate",costPercent.getQtdUserPercent()); - data.put("salesExpenseRate",costPercent.getQtdRegionPercent()); - data.put("adminiExpenseRate",costPercent.getQtdRegion2Percent()); - data.put("budgetExpenseRate",costPercent.getQtdBudgetPercent()); - data.put("ytdBudgetExpenseRate",costPercent.getYtdBudgetPercent()); - } + //读取费费率 + TbsCostApply tbsCostApply = costApplyService.getById(activity.getCostApplyId()); + costApplyService.buildMainData4ROI(tbsCostApply,data); //拓展添加审批关联 data.put("biz_region", bizRegionNames);