From 066fbfa1ddc8126b848be14edf7719cf6de2593f Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 1 Feb 2023 17:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=9B=9E=E9=80=80=E5=90=8E=EF=BC=8C=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E9=87=91=E9=A2=9D=E9=87=8D=E5=A4=8D=E6=89=A3=E9=99=A4?=
 =?UTF-8?q?=EF=BC=9B=E9=A2=84=E7=AE=97=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E8=80=83=E6=A0=B8=E6=9C=9F=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/tbs/entity/TbsBudgetLog.java   | 16 ++++++++++++++++
 .../tbs/mapper/TbsScheduleItemBudgetMapper.java  |  4 ++--
 .../tbs/service/TbsBudgetApplicationService.java |  2 +-
 .../impl/TbsBudgetCostItemServiceImpl.java       |  1 +
 .../service/impl/TbsBudgetLogServiceImpl.java    |  4 ++++
 .../tbs/service/impl/TbsBudgetServiceImpl.java   |  4 ++++
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java
index cb3847bf..267f64eb 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java
@@ -73,6 +73,22 @@ public class TbsBudgetLog implements Serializable {
     @NotNull(message = "考核期项id不能为空")
     private Long scheduleItemId;
 
+    /** 预算的考核期id */
+    @NotNull(message = "预算的考核期id不能为空")
+    private Long scheduleItemBudgetId;
+
+    /** 原考核id */
+    @NotNull(message = "考核id不能为空")
+    private Long scheduleOrgId;
+
+    /** 原考核期项id */
+    @NotNull(message = "考核期项id不能为空")
+    private Long scheduleItemOrgId;
+
+    /** 原预算的考核期id */
+    @NotNull(message = "预算的考核期id不能为空")
+    private Long scheduleItemBudgetOrgId;
+
     /** 考核编码 */
     @NotBlank(message = "考核编码不能为空")
     @Length(max = 30,message = "考核编码长度不能超过30字")
diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java
index 66271ce3..dc9a21d3 100644
--- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java
+++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java
@@ -23,8 +23,8 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
             " LEFT JOIN `tbs_cost_apply` " +
             " ON  `tbs_budget_cost_item`.cost_apply_id = `tbs_cost_apply`.id " +
             " WHERE `tbs_cost_apply`.charge_state = 1 OR  `tbs_cost_apply`.charge_state = 4 " +
-            " AND `tbs_budget_cost_item`.id = #{scheduleItemBudgetId}")
-    BigDecimal totalApplyAmount(@Param("scheduleItemBudgetId") Long scheduleItemBudgetId);
+            " AND `tbs_budget_cost_item`.id = #{scheduleItemBudgetId} and `tbs_cost_apply`.id != #{applyId}")
+    BigDecimal totalApplyAmount(@Param("scheduleItemBudgetId") Long scheduleItemBudgetId,@Param("applyId") Long applyId);
 
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
index 8f00a20d..f1219385 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
@@ -208,7 +208,7 @@ public class TbsBudgetApplicationService {
         //统计费用申请占用金额
         Map<Long,BigDecimal> budgetItemApplyAmountMap = new HashMap<>(scheduleItemList.size());
         for (TbsScheduleItemBudget itemBudget : scheduleItemList) {
-            BigDecimal budgetItemApplyAmount =  tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getId());
+            BigDecimal budgetItemApplyAmount =  tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getId(),costApplyId);
             budgetItemApplyAmountMap.put(itemBudget.getId(),budgetItemApplyAmount);
         }
         //统计当前活动前置项占用预算
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java
index cd76fd77..05b77a1d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java
@@ -35,6 +35,7 @@ public class TbsBudgetCostItemServiceImpl extends ServiceImpl<TbsBudgetCostItemM
         if(CollectionUtil.isNotEmpty(ids)){
             LambdaQueryWrapper<TbsBudgetCostItem> costLqw = new LambdaQueryWrapper<>();
             costLqw.in(TbsBudgetCostItem::getScheduleItemBudgetId,ids);
+            costLqw.eq(TbsBudgetCostItem::getInvalidFlag,0);
             if(neCostApplyId!=null){
                 costLqw.ne(TbsBudgetCostItem::getCostApplyId,neCostApplyId);
             }
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java
index 956f48fc..ebc83106 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java
@@ -35,6 +35,10 @@ public class TbsBudgetLogServiceImpl extends ServiceImpl<TbsBudgetLogMapper,TbsB
         budgetLog.setAmount(amount);
         budgetLog.setScheduleId(item.getScheduleId());
         budgetLog.setScheduleItemId(item.getScheduleItemId());
+        budgetLog.setScheduleItemBudgetId(item.getId());
+        budgetLog.setScheduleOrgId(item.getScheduleId());
+        budgetLog.setScheduleItemOrgId(item.getScheduleItemId());
+        budgetLog.setScheduleItemBudgetOrgId(item.getId());
         budgetLog.setItemName(item.getScheduleItemName());
         budgetLog.setStartDate(item.getActStartDate().atStartOfDay());
         budgetLog.setEndDate(item.getActEndDate().atStartOfDay());
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
index 2326ad9e..f328bbda 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
@@ -250,6 +250,10 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         budgetLog.setAmount(amount);
         budgetLog.setScheduleId(scheduleItemBudget.getScheduleId());
         budgetLog.setScheduleItemId(scheduleItemBudget.getScheduleItemId());
+        budgetLog.setScheduleItemBudgetId(scheduleItemBudget.getId());
+        budgetLog.setScheduleOrgId(scheduleItemBudget.getScheduleId());
+        budgetLog.setScheduleItemOrgId(scheduleItemBudget.getScheduleItemId());
+        budgetLog.setScheduleItemBudgetOrgId(scheduleItemBudget.getId());
         budgetLog.setItemName(scheduleItemBudget.getItemName());
         budgetLog.setStartDate(scheduleItemBudget.getStartDate());
         budgetLog.setEndDate(scheduleItemBudget.getEndDate());