From 89a5f3716b68f2209621042cabf3a9871d23ecbc Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 17 Jul 2024 16:11:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E6=A0=B8=E9=94=80=E9=87=91=E9=A2=9D=E9=87=8A=E6=94=BE?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/controller/TbsActivityController.java    | 16 ++++++++++++++++
 .../vtb/service/VtbVerificationApplication.java  | 10 ++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
index 04efe476..3d1c7dff 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
@@ -370,6 +370,22 @@ public class TbsActivityController {
         return R.ok();
     }
 
+    /**
+     * 释放活动费用
+     * @param id
+     * @return
+     */
+    @PostMapping("/release2/{id}")
+    @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE)
+    @PreAuthorize("hasRole('tbs:activity:release')")
+    public R<?> release2(@PathVariable("id") Long id){
+        SysUser sysUser = new SysUser();
+        sysUser.setName("系统执行");
+        sysUser.setCode("0");
+        verificationService.release(id,sysUser.getCode(),false);
+        return R.ok();
+    }
+
     /**
      * 释放活动费用
      * @return
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 cf9668e6..bfbac82e 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
@@ -82,6 +82,16 @@ public class VtbVerificationApplication {
         //临时测试
         boolean devFlag = false;
         VtbVerification verification = vtbVerificationService.getById(affairCommit.getCostApplyId());
+        //更新释放标识
+        if(affairCommit.getReleaseFlag()!=null){
+            VtbVerification vtbVer = new VtbVerification();
+            vtbVer.setId(verification.getId());
+            vtbVer.setRegReleaseFlag(affairCommit.getReleaseFlag());
+            vtbVer.setRegReleaseUserId(AuthContextUtils.getSysUserId());
+            vtbVerificationService.updateById(vtbVer);
+            //完成时会调用更新
+            verification.setRegReleaseFlag(affairCommit.getReleaseFlag());
+        }
         if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){
             VtbVerificationOperationServiceImpl optSvc = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
             optSvc.runCompensate(verification.getId()+"");