From dafe2764a34cebbed469f77fae607f85bbe1c847 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 30 Nov 2023 16:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=A0=B8=E9=94=80=EF=BC=8Cdebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/vtb/service/VtbVerificationApplication.java | 3 ++-
 .../modules/vtb/service/impl/VtbFundFlowServiceImpl.java      | 1 +
 .../modules/vtb/service/impl/VtbVerificationServiceImpl.java  | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
index c33fa997..a7d65424 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
@@ -98,7 +98,7 @@ public class VtbVerificationApplication {
             VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
             String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString());
             if(devFlag){
-                summeryResult = "next";
+                summeryResult = "finished";
             }
             R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult);
             try {
@@ -422,6 +422,7 @@ public class VtbVerificationApplication {
         vtbVer.setFinishedTime(LocalDateTime.now());
         vtbVer.setRegReleaseFlag(verification.getRegReleaseFlag());
         vtbVerificationService.updateById(vtbVer);
+        //刷新本次核销数据
         vtbVerificationService.successCommit(verification.getId());
 
         LambdaQueryWrapper<TbsActivity> countOLqw = new LambdaQueryWrapper<>();
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
index 71aafc2b..ef867a3e 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
@@ -198,6 +198,7 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
                 }
                 TbsActivitySubject activitySubject = new TbsActivitySubject();
                 activitySubject.setId(currActivitySubject.getId());
+                activitySubject.setSubjectId(currActivitySubject.getSubjectId());
                 activitySubject.setUsedAmount(subjectTotal);
                 activitySubject4Update.add(activitySubject);
                 //更新成本中心
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 36352268..bf02fda8 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
@@ -1291,13 +1291,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
 
         fundFlowService.saveBatch(addFundFlowList);
-        //更新已用费用记录，并更新活动状态是否完成（旧流程按比例分配，新流程按比例分配后，进行再分配）
-        fundFlowService.flushActivityAmount(verification.getActivityId());
         //fundFlow绑定考核期项，用于合计预算使用情况
         LambdaQueryWrapper<VtbVerificationSubject> subjectLqw = new LambdaQueryWrapper<>();
         subjectLqw.eq(VtbVerificationSubject::getVerificationId,verificationId);
         VtbVerificationSubject subjectParam = new VtbVerificationSubject();
         subjectParam.setEffectiveFlag(1);
+        //更新已用费用记录，并更新活动状态是否完成（旧流程按比例分配，新流程按比例分配后，进行再分配）
+        fundFlowService.flushActivityAmount(verification.getActivityId());
         verificationSubjectService.update(subjectParam,subjectLqw);
         //更新成本中心维度
         if(isCenterCommit){