From 8813181c47c18b37aec0e314ee92d95a47a10e60 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 3 Jul 2023 09:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B9=E7=94=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8F=82=E6=95=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tbs/entity/TbsScheduleItemBudget.java  |  7 +++++++
 .../modules/tbs/entity/dto/TbsCostSubItem.java     | 14 ++++++++++++--
 .../tbs/service/impl/TbsCostApplyServiceImpl.java  |  4 +++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java
index ee6a1879..f5aaaeb2 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java
@@ -103,5 +103,12 @@ public class TbsScheduleItemBudget implements Serializable {
     private String delFlag;
 
 
+    public BigDecimal compareTargetExpenseRate(){
+        if(budgetAmount!=null&&preDispatchAmount!=null&&preDispatchAmount.compareTo(BigDecimal.ZERO)!=0){
+            return budgetAmount.divide(preDispatchAmount,BigDecimal.ROUND_DOWN);
+        }
+        return null;
+    }
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java
index 52f73f7e..46d04f58 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java
@@ -27,8 +27,18 @@ public class TbsCostSubItem {
     @Data
     @AllArgsConstructor
     public static class Amount{
-        private BigDecimal budgetAmount;
-        private BigDecimal preDispatchAmout;
+
+        //budgetAmount
+        private BigDecimal areaBudget;
+
+        //preDispatchAmout
+        private BigDecimal targetSales;
+
+        //targetExpenseRate = areaBudget/targetSales
+        private BigDecimal targetExpenseRate;
+
+
+
     }
 
 }
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 0ade6d7c..b27b51aa 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
@@ -296,7 +296,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         for(TbsScheduleItemBudget tbsScheduleItemBudget : tbsScheduleItemBudgets){
             subList.add(
                     new TbsCostSubItem.Amount(
-                            tbsScheduleItemBudget.getBudgetAmount(),tbsScheduleItemBudget.getPreDispatchAmount()
+                            tbsScheduleItemBudget.getBudgetAmount(),
+                            tbsScheduleItemBudget.getPreDispatchAmount(),
+                            tbsScheduleItemBudget.compareTargetExpenseRate()
                     )
             );
         }