修复取消异动时，预算占用的异常

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," +

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)){

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);
     }

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);