From 26ba54c265416e743ce13ceb402bacaa5f85f347 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 3 Jan 2024 08:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=BD=BF=E7=94=A8=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/mapper/TbsBudgetLog2Mapper.java        |  9 +++++++++
 .../impl/TbsScheduleItemBudgetServiceImpl.java |  2 +-
 .../resources/mapper/tbs/TbsBudget2Mapper.xml  | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLog2Mapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLog2Mapper.java
index 611f7582..7fd7f6b1 100644
--- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLog2Mapper.java
+++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLog2Mapper.java
@@ -22,6 +22,15 @@ import java.util.List;
 public interface TbsBudgetLog2Mapper extends BaseMapper<TbsBudgetLog> {
 
 
+    /**
+     * 统计budget金额
+     * @param ids budgetId
+     * @param optNumbers 包含
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    List<TbsBudgetLogWithAmount> getSumFinalAmtInList(@Param("selectIds") List<Long> ids, @Param("optNumbers")List<Integer> optNumbers);
+
     /**
      * 统计budget金额
      * @param ids budgetId
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java
index 56f2441f..0aa3ee15 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java
@@ -223,7 +223,7 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
         List<TbsBudget> budgetList = tbsBudgetMapper.selectBatchIds(budgetIds);
 
         // 预算金额
-        List<TbsBudgetLogWithAmount> finalList = tbsBudgetLog2Mapper.getSumAmtInList(scheduleItemBudgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
+        List<TbsBudgetLogWithAmount> finalList = tbsBudgetLog2Mapper.getSumFinalAmtInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
 
         // 被占用金额
         List<TbsBudgetLogWithAmount> usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(scheduleItemBudgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
diff --git a/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml b/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml
index b61bfa7a..9e15857e 100644
--- a/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml
+++ b/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml
@@ -36,6 +36,24 @@
         group by tbs_schedule_item_budget.id
     </select>
 
+
+    <select id="getSumFinalAmtInList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
+        select
+        budget_id as id,
+        sum(amount) as amt
+        from tbs_budget_log
+        where
+        del_flag = 0 and  opt_type not in
+        <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
+            #{selectId}
+        </foreach>
+        AND budget_id in
+        <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
+            #{selectId}
+        </foreach>
+        group by budget_id
+    </select>
+
     <select id="getSumAmtInList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
         select
         budget_id as id,