From 0ebfdfab8961fa13946d2eccfdb1d267a7b53e60 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 28 Sep 2023 16:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=B4=B9=E7=94=A8=E7=8E=87?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/service/TbsCostApplyService.java      |  2 ++
 .../service/impl/TbsCostApplyServiceImpl.java |  2 +-
 .../impl/VtbVerificationServiceImpl.java      | 20 +++----------------
 3 files changed, 6 insertions(+), 18 deletions(-)

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<TbsCostApply> {
      */
     void flushCostStatus(Long costApplyId,boolean isContractFlag);
 
+    void buildMainData4ROI(TbsCostApply tbsCostApply, Map<String, Object> 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<TbsCostApplyMapper,TbsC
      * @param tbsCostApply
      * @param data
      */
-    private void buildMainData4ROI(TbsCostApply tbsCostApply, Map<String, Object> data) {
+    public void buildMainData4ROI(TbsCostApply tbsCostApply, Map<String, Object> 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<VtbVerificationMappe
         data.put("jinE", verification.getAmount().toString());
         data.put("money", verification.getAmount().toString());
 
-        //读取费用申请时的费率
-        LambdaQueryWrapper<TbsCostPercent> costPercentLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        costPercentLambdaQueryWrapper.eq(TbsCostPercent::getCostApplyId, activity.getCostApplyId());
-        List<TbsCostPercent> 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);