opt: 跳过流程调整

src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java

@@ -117,9 +117,9 @@ public class VisitMainOuterApi {
     public R<Boolean> getThemeAndValidById(@PathVariable("id") String id){
         VisitTheme visitTheme = visitThemeService.getById(id);
         LocalDateTime nowTime = LocalDateTime.now();
-        if(visitTheme.getCodeStartDate()!=null&&nowTime.isBefore(visitTheme.getCodeStartDate())){
+//        if(visitTheme.getCodeStartDate()!=null&&nowTime.isBefore(visitTheme.getCodeStartDate())){
-            return R.ok(false,"登记时间未开始");
+//            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
+        // 不管有没有跳过流程，始终要调用OA，跳过流程只针对OA来说
-                &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){
+//        if(visitTheme.getSkipApprovalFlag()!=null
-            // 跳过审批
+//                &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){
-            visitMainService.doFinish(entity.getId(),null);
+//            // 跳过审批
-        }else {
+//            visitMainService.doFinish(entity.getId(),null);
+//        }else {
+//            visitMainService.submitOaFlow(entity.getId());
+//        }
         // 申请审批
         visitMainService.submitOaFlow(entity.getId());
-        }
         return R.ok(param.getId());
     }