From 31b537028effdae44c86e73aa6b9fcedc225eb31 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 26 Jul 2023 18:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=B1=BB=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=9B=E6=B7=BB=E5=8A=A0=E5=8D=B0=E7=AB=A0=EF=BC=9B=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/entity/bo/TbsCostContractBo.java        |  2 --
 .../service/impl/TbsCostApplyServiceImpl.java   | 17 +++++++++--------
 .../impl/VtbVerificationServiceImpl.java        | 10 +++++++++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java
index b4cabbdc..4f9b48db 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java
@@ -79,12 +79,10 @@ public class TbsCostContractBo implements Serializable {
 
     /** 使用印章次数 */
     @NotNull(message = "印章次数不能为空")
-    @Length(max = 255,message = "使用印章次数长度不能超过255字")
     private Integer sealNum;
 
     /** 文件份数 */
     @NotNull(message = "文件份数不能为空")
-    @Length(max = 255,message = "文件份数长度不能超过255字")
     private Integer fileNum;
 
 }
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index 602b0271..6285c05d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -111,9 +111,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         LambdaQueryWrapper<VtbVerification> vtbLqw = new LambdaQueryWrapper<>();
         vtbLqw.eq(VtbVerification::getCostApplyId,id);
         vtbLqw.and(
-                qw->qw.eq(VtbVerification::getVerificationState, VtbVerificationState.Finished)
+                qw->qw.eq(VtbVerification::getVerificationState, VtbVerificationState.Finished.getCode())
                         .or()
-                        .eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting)
+                        .eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting.getCode())
         );
         long count = verificationMapper.selectCount(vtbLqw);
         if(count>0){
@@ -122,6 +122,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         TbsCostApply costApply4Update = new TbsCostApply();
         costApply4Update.setId(id);
         costApply4Update.setChargeState(TbsCostApplyState.State_6_remove.getCode());
+        this.updateById(costApply4Update);
         //删除费用占用的预算
         LambdaQueryWrapper<TbsBudgetLog> rmLogLqw = new LambdaQueryWrapper<>();
         rmLogLqw.eq(TbsBudgetLog::getCostApplyId,id);
@@ -706,12 +707,12 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                     costCenter.setTargetExpenseRate(totalBudgetAmount.divide(totalPreDispatchAmount, BigDecimal.ROUND_DOWN));
                 }
                 //暂保持目标相关数据一致
-                costCenter.setYtdTargetSales(costCenter.getTargetSales());
-                costCenter.setYtdTargetBudget(costCenter.getAreaBudget());
-                costCenter.setYtdTargetExpenseRate(costCenter.getTargetExpenseRate());
-                costCenter.setQtdTargetSales(costCenter.getTargetSales());
-                costCenter.setQtdTargetBudget(costCenter.getAreaBudget());
-                costCenter.setQtdTargetExpenseRate(costCenter.getTargetExpenseRate());
+                costCenter.setYtdTargetSales(costCenter.getTargetSales().setScale(2,BigDecimal.ROUND_DOWN));
+                costCenter.setYtdTargetBudget(costCenter.getAreaBudget().setScale(2,BigDecimal.ROUND_DOWN));
+                costCenter.setYtdTargetExpenseRate(costCenter.getTargetExpenseRate().setScale(2,BigDecimal.ROUND_DOWN));
+                costCenter.setQtdTargetSales(costCenter.getTargetSales().setScale(2,BigDecimal.ROUND_DOWN));
+                costCenter.setQtdTargetBudget(costCenter.getAreaBudget().setScale(2,BigDecimal.ROUND_DOWN));
+                costCenter.setQtdTargetExpenseRate(costCenter.getTargetExpenseRate().setScale(2,BigDecimal.ROUND_DOWN));
 //                    costCenter.setMtdTargetSales();
 //                    costCenter.setMtdTargetBudget();
 //                    costCenter.setMtdTargetExpenseRate();
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index f26eb06f..6e86a46a 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -108,6 +108,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final TbsCostPercentMapper costPercentMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void removeCheck(Long id) {
         VtbVerification verification = this.getById(id);
         if (!verification.getVerificationState().equals(VtbVerificationState.Finished.getCode())){
@@ -118,10 +119,17 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         //判断费用申请类型
         TbsCostApply costApply = costApplyService.getById(verification.getCostApplyId());
         if(costApply.getContractFlag().equals(1)){
-
+            LambdaQueryWrapper<TbsActivityPayCondition> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            contractLambdaQueryWrapper.eq(TbsActivityPayCondition::getActivityId,verification.getActivityId());
+            TbsActivityPayCondition payCondition = activityPayConditionService.getOne(contractLambdaQueryWrapper,false);
+            payCondition.setFinishedFlag(0);
+            activityPayConditionService.updateById(payCondition);
         }
         //更新活动统计金额
+
         //更新活动状态
+        //如果为最后的活动，更变费用申请状态
+        costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1));
     }
 
     private void removeWithVerification(Long verificationId){