From e4997f1d7b1145d62d959f9b31fff63a881d17e9 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Sun, 2 Jul 2023 09:30:33 +0800
Subject: [PATCH] =?UTF-8?q?OA=E7=9A=84=E8=B4=B9=E7=94=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/service/impl/TbsCostApplyServiceImpl.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 0f77c44e..cbe8a189 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
@@ -11,6 +11,8 @@ import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
 import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo;
+import com.qs.serve.modules.bir.service.BirRoiRateService;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSubject;
@@ -79,6 +81,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private TbsActivityPayConditionMapper tbsActivityPayConditionMapper;
     private TbsActivityMapper tbsActivityMapper;
     private ProjectProperties projectProperties;
+    private BirRoiRateService birRoiRateService;
 
     @Override
     public Long selectCountOverdueState(String userId) {
@@ -218,6 +221,16 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("exsp1",TbsSeeYonConst.CostApplyConf.Code());
         data.put("money",tbsCostApply.getTotalActivityAmount());
 
+        YtdQtdToOAVo ytdQtdToOAVo =  birRoiRateService.buildYtdAndQtdData(tbsCostApply);
+        data.put("",ytdQtdToOAVo.getYtdCustomerPercent());
+        data.put("",ytdQtdToOAVo.getYtdUserPercent());
+        data.put("",ytdQtdToOAVo.getYtdRegionPercent());
+        data.put("",ytdQtdToOAVo.getYtdRegion2Percent());
+        data.put("",ytdQtdToOAVo.getQtdCustomerPercent());
+        data.put("",ytdQtdToOAVo.getQtdUserPercent());
+        data.put("",ytdQtdToOAVo.getQtdRegionPercent());
+        data.put("",ytdQtdToOAVo.getQtdRegion2Percent());
+
         //拓展添加审批关联区域
         String saleRegionId = supplier.handleSaleRegionId();
         String bizRegionId = supplier.handleBizRegionId();