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 69170be..da20ec5 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 @@ -225,16 +225,16 @@ public class VisitMainOuterApi { entity.setSubmitTime(LocalDateTime.now()); visitMainService.saveOrUpdate(entity); - // 不管有没有跳过流程,始终要调用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()); + // 来访申请设置跳过审批,则直接完成来访登记,否则调用OA + if(visitTheme.getSkipApprovalFlag()!=null + &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){ + // 都需要调用OA(完成知会相关通知) + visitMainService.submitOaFlow(entity.getId()); + // 忽略审批结果 + visitMainService.doFinish(entity.getId(),null); + }else { + visitMainService.submitOaFlow(entity.getId()); + } return R.ok(param.getId()); }