From cf831cee64a97613e3e2e62d353d8b022a13ffc3 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 23 Jan 2024 09:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E5=BC=82?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=EF=BC=8C=E9=A2=84=E7=AE=97=E5=8D=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java    | 7 +++++++
 .../tbs/service/impl/TbsCostApplyOperationServiceImpl.java | 4 ++--
 .../tbs/service/impl/TbsCostApplyPart1ServiceImpl.java     | 2 +-
 .../modules/tzc/controller/TzcPolicyTestController.java    | 6 ++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java
index 655165e6..39046b72 100644
--- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java
+++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java
@@ -39,6 +39,13 @@ public interface TbsBudgetLogMapper extends BaseMapper<TbsBudgetLog> {
     @Update("update tbs_budget_log set del_flag = #{delState} WHERE cost_apply_id = #{costApplyId}")
     void updateLogDelFlagByCostApply(@Param("costApplyId")Long costApplyId,@Param("delState")Integer delState);
 
+    /**
+     * 适配异动状态2的记录
+     * @param costApplyId
+     * @param delState
+     */
+    @Update("update tbs_budget_log set del_flag = #{delState} WHERE cost_apply_id = #{costApplyId} and del_flag = 2 ")
+    void updateLogDelFlagCancelByCostApply(@Param("costApplyId")Long costApplyId,@Param("delState")Integer delState);
 
     @Select("SELECT " +
             " tbs_cost_apply.id," +
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
index ee4b6d81..a172630a 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
@@ -319,8 +319,8 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         TbsCostApply costApply = costApplyService.getById(targetId);
         //判断异动
         if(costApply.getChangeSourceId()!=null){
-            //移除
-            tbsBudgetLogMapper.updateLogDelFlagByCostApply(costApply.getChangeSourceId(),1);
+            //移除(标记2，用于区分一般删除)
+            tbsBudgetLogMapper.updateLogDelFlagByCostApply(costApply.getChangeSourceId(),2);
         }
         //判断审批过程，是否修改了金额
         if(costApply.getEditAmountFlag().equals(1)){
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
index 92f5aabc..b3f09b9f 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
@@ -218,7 +218,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         updActEntity.setCancelFlag(0);
         tbsActivityMapper.update(updActEntity,updActLqw);
         //恢复原来的费用占用
-        tbsBudgetLogMapper.updateLogDelFlagByCostApply(extCost.getChangeSourceId(),0);
+        tbsBudgetLogMapper.updateLogDelFlagCancelByCostApply(extCost.getChangeSourceId(),0);
         //删除当前的异动记录
         tbsBudgetLogMapper.updateLogDelFlagByCostApply(extCost.getId(),1);
     }
diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java
index eb2fdc18..1ff4a7a1 100644
--- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java
+++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java
@@ -80,7 +80,7 @@ public class TzcPolicyTestController {
 
     @GetMapping("/testSyncPolicy")
     public R<?>  syncPolicy(Long policyId){
-        tzcPolicyApplicationService.syncPolicy(policyId);
+        //tzcPolicyApplicationService.syncPolicy(policyId);
         return R.ok();
     }
 
@@ -88,9 +88,7 @@ public class TzcPolicyTestController {
     @GetMapping("/rebulidAllPolicy")
     public R<?> rebulidAllPolicy(){
         Long[] ids = new Long[]{
-                685L,
-                771L,
-                995L
+
         };
         for (Long id : ids) {
             rebuildPolicy(id);