From fcb3a067124ec28aff293b9e4c08a4b6b3e899ff Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Sat, 28 Jan 2023 16:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF=E5=90=AF?=
 =?UTF-8?q?=E5=81=9C=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qs/serve/modules/seeyon/service/SeeYonService.java | 5 +++++
 .../modules/tbs/controller/TbsCostApplyController.java     | 5 +++++
 .../modules/tbs/service/impl/TbsCostApplyServiceImpl.java  | 7 +++++++
 .../vtb/service/impl/VtbVerificationServiceImpl.java       | 3 ++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java
index 3839acd1..461311bc 100644
--- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java
+++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java
@@ -28,6 +28,11 @@ public interface SeeYonService {
      */
     R<String> baseCreateProcess(BaseCreateProcessBo createProcessBo);
 
+    /**
+     * 创建流程后回调，更新记录状态
+     * @param createCallbackBo
+     * @return
+     */
     R<String> createCallbackStatus(BaseCreateCallbackBo createCallbackBo);
 
     /**
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 d34d50cf..0d810caa 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
@@ -60,6 +60,7 @@ public class TbsCostApplyController {
 
     private TbsCostApplyService tbsCostApplyService;
     private TbsActivityService tbsActivityService;
+    private TbsActivityTemplateService tbsActivityTemplateService;
     private TbsBudgetLogService tbsBudgetLogService;
     private BmsSupplierService bmsSupplierService;
     private SysUserService sysUserService;
@@ -239,6 +240,10 @@ public class TbsCostApplyController {
     @PreAuthorize("hasRole('tbs:costApply:insert')")
     @Transactional(rollbackFor = Exception.class)
     public R<?> save(@RequestBody @Valid TbsCostApplyActivityBo param){
+        TbsActivityTemplate activityTemplate = tbsActivityTemplateService.getById(param.getTemplateId());
+        if(activityTemplate.getTemplateState().equals(0)){
+            return R.error("当前模板已停用");
+        }
         TbsCostApplyBo costApplyBo = param.getCostApplyBo();
         ValidateTools.valid(costApplyBo);
         TbsCostApply entity = CopierUtil.copy(costApplyBo,new TbsCostApply());
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 6d6733d1..abb2b3d5 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
@@ -46,6 +46,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private TbsBudgetLogService budgetLogService;
     private SysUserService sysUserService;
     private SeeYonService seeYonService;
+    private TbsActivityTemplateService tbsActivityTemplateService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -55,6 +56,12 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 &&!tbsCostApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())){
             Assert.throwEx("操作失败，申请费用状态不支持");
         }
+        if(tbsCostApply.getTemplateId()!=null){
+            TbsActivityTemplate activityTemplate = tbsActivityTemplateService.getById(tbsCostApply.getTemplateId());
+            if(activityTemplate.getTemplateState().equals(0)){
+                Assert.throwEx("当前模板已停用");
+            }
+        }
         TbsBudgetCostResult result = budgetApplicationService.buildBudgetCostResult(tbsCostApply.getId(),true,false);
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         sysUser.checkSyAccount();
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 103d2bb3..37148c53 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
@@ -338,7 +338,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         LocalDate nowDate = LocalDate.now();
         if(activity.getReopenFlag().equals(0)
                 && filterActTime
-                && nowDate.isAfter(activity.getActEndDate())){
+                && nowDate.isAfter(activity.getActEndDate())
+                && nowDate.isAfter(activity.getPreCheckDate())){
             Assert.throwEx("活动已结束");
         }
         if(activity.getActivityState().equals(TbsActivityState.STATE_1_Baning)){