From 0ec13333f0680e558e33183bc71bc00417c270f8 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 8 Dec 2023 17:48:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E9=99=A4=E8=B4=B9?= =?UTF-8?q?=E7=94=A8(=E7=AE=A1=E7=90=86=E5=91=98debug)=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=87=91=E9=A2=9D=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbsCostApplyController.java | 7 ++ .../tbs/mapper/TbsCostApplyRemoveMapper.java | 65 ++++++++++--------- .../TbsCostApplyOperationServiceImpl.java | 3 +- .../service/impl/TbsDealErrorApplication.java | 2 - 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index ce91abcd..f64033bf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/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(); + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyRemoveMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyRemoveMapper.java index e4d875e8..b6554638 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyRemoveMapper.java +++ b/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); } 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 4d7136d3..7ec87abe 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 @@ -345,7 +345,8 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService List 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()) ){ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java index f35a9604..810eb638 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java @@ -101,8 +101,6 @@ public class TbsDealErrorApplication { } } - - } }