diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java index adf247c..69170be 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java @@ -117,9 +117,9 @@ public class VisitMainOuterApi { public R getThemeAndValidById(@PathVariable("id") String id){ VisitTheme visitTheme = visitThemeService.getById(id); LocalDateTime nowTime = LocalDateTime.now(); - if(visitTheme.getCodeStartDate()!=null&&nowTime.isBefore(visitTheme.getCodeStartDate())){ - return R.ok(false,"登记时间未开始"); - } +// if(visitTheme.getCodeStartDate()!=null&&nowTime.isBefore(visitTheme.getCodeStartDate())){ +// return R.ok(false,"登记时间未开始"); +// } if(visitTheme.getCodeEndDate()!=null&&nowTime.isAfter(visitTheme.getCodeEndDate())){ return R.ok(false,"已结束登记"); } @@ -225,14 +225,16 @@ public class VisitMainOuterApi { entity.setSubmitTime(LocalDateTime.now()); visitMainService.saveOrUpdate(entity); - if(visitTheme.getSkipApprovalFlag()!=null - &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){ - // 跳过审批 - visitMainService.doFinish(entity.getId(),null); - }else { - // 申请审批 - visitMainService.submitOaFlow(entity.getId()); - } + // 不管有没有跳过流程,始终要调用OA,跳过流程只针对OA来说 +// if(visitTheme.getSkipApprovalFlag()!=null +// &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){ +// // 跳过审批 +// visitMainService.doFinish(entity.getId(),null); +// }else { +// visitMainService.submitOaFlow(entity.getId()); +// } + // 申请审批 + visitMainService.submitOaFlow(entity.getId()); return R.ok(param.getId()); }