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()+"");