添加移除费用(管理员debug)，调整金额异常修复

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -524,5 +524,12 @@ public class TbsCostApplyController {
         return R.ok();
     }
 
+    public R<?> dealCostBudget(Long costApplyId){
+        //调整center_goods和budget_log之间的占用
+
+        //改方法支持审批完成时回调更新
+        return R.ok();
+    }
+
 }
 

src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyRemoveMapper.java

@@ -1,5 +1,7 @@
 package com.qs.serve.modules.tbs.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
@@ -9,93 +11,96 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface TbsCostApplyRemoveMapper {
 
-    @Update("update  tbs_cost_apply set del_flag = 0 where id = #{costApplyId}")
+    @Update("update  tbs_cost_apply set  del_flag = 1 where id = #{costApplyId}")
     int tbs_cost_apply(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_center set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_center set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_center(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_center_goods set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_center_goods set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_center_goods(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_goods set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_goods set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_goods(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_channel set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_channel set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_channel(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_channel_point set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_channel_point set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_channel_point(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_pay_condition set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_pay_condition set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_pay_condition(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_slotting_fee set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_slotting_fee set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_slotting_fee(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_subject set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_subject set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_subject(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_activity_subject_yarn set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_activity_subject_yarn set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_activity_subject_yarn(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification(@Param("costApplyId") Long costId);
 
-    @Update("update  pay_payment set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  pay_payment set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int pay_payment(@Param("costApplyId") Long costId);
 
-    @Update("update  pay_payment_item set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  pay_payment_item set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int pay_payment_item(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_budget_log set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_budget_log set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_budget_log(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_budget_cost_item set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_budget_cost_item set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_budget_cost_item(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_budget_cost_item_split set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_budget_cost_item_split set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_budget_cost_item_split(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_fund_flow set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_fund_flow set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_fund_flow(@Param("costApplyId") Long costId);
 
-    @Update("update  bir_activity_center_goods set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @InterceptorIgnore(tenantLine = "true")
+    @Delete("delete from bir_activity_center_goods where cost_apply_id = #{costApplyId}")
     int bir_activity_center_goods(@Param("costApplyId") Long costId);
 
-    @Update("update  bir_base_activity set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @InterceptorIgnore(tenantLine = "true")
+    @Delete("delete from bir_base_activity where cost_apply_id = #{costApplyId}")
     int bir_base_activity(@Param("costApplyId") Long costId);
 
-    @Update("update  bir_payment_item set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @InterceptorIgnore(tenantLine = "true")
+    @Delete("delete from bir_payment_item where cost_apply_id = #{costApplyId}")
     int bir_payment_item(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification_subject set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification_subject set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification_subject(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification_yard_item set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification_yard_item set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification_yard_item(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification_yard_center_item set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification_yard_center_item set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification_yard_center_item(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification_subject_center set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification_subject_center set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification_subject_center(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification_channel_point set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification_channel_point set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification_channel_point(@Param("costApplyId") Long costId);
 
-    @Update("update  vtb_verification_channel set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  vtb_verification_channel set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int vtb_verification_channel(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_cost_contract set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_cost_contract set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_cost_contract(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_cost_percent set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_cost_percent set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_cost_percent(@Param("costApplyId") Long costId);
 
-    @Update("update  tbs_cost_todo set del_flag = 0 where cost_apply_id = #{costApplyId}")
+    @Update("update  tbs_cost_todo set  del_flag = 1 where cost_apply_id = #{costApplyId}")
     int tbs_cost_todo(@Param("costApplyId") Long costId);
 }

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -345,7 +345,8 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         List<TbsBudgetLog> budgetLogList = tbsBudgetLogMapper.selectList(budgetLogLqw);
         for (TbsBudgetLog budgetLog : budgetLogList) {
             for (TbsActivityCenterGoods centerGoods : activityCenterGoodsList) {
-                if( budgetLog.getSubjectId().equals(centerGoods.getSubjectId())
+                if( budgetLog.getActivityId().equals(centerGoods.getActivityId())
+                &&budgetLog.getSubjectId().equals(centerGoods.getSubjectId())
                         && budgetLog.getCenterType().equals(centerGoods.getCenterType())
                         && budgetLog.getCenterId().equals(centerGoods.getCenterId())
                 ){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java

@@ -101,8 +101,6 @@ public class TbsDealErrorApplication {
                 }
             }
 
-
-
         }
     }