添加模板启停拦截

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);
 
     /**

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

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

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)){