修复准考证生成逻辑

app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -312,11 +312,17 @@ class RecruitTicketController extends Controller
             if($face['type'] == 2 && (!array_key_exists('data',$face) || empty($face['data']))){
                 return response()->json(['status' => 0, 'msg' => '请上传面试准考证数据'], 200);
             }
+            if(!array_key_exists('ex_start',$face) || empty($face['ex_start'])){
+                return response()->json(['status' => 0, 'msg' => '准考证开启打印时间不能为空'], 200);
+            }
+            if(!array_key_exists('ex_end',$face) || empty($face['ex_end'])){
+                return response()->json(['status' => 0, 'msg' => '准考证结束打印时间不能为空'], 200);
+            }
 
             switch ($face['type']){
                 case '0':
                     Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
-                    $ticket = new TicketJob($data['recruit_id'],'face',['type' => '0']);
+                    $ticket = new TicketJob($data['recruit_id'],'face',['type' => '0','ex_start' => $face['ex_start'], 'ex_end' => $face['ex_end']]);
                     dispatch($ticket);
                     return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
                     break;
@@ -324,7 +330,7 @@ class RecruitTicketController extends Controller
                     //自动生成
                     $ticket_data = [
                         'type' => 1,
-                        'auto_each_number' => $pen['auto_each_number']
+                        'auto_each_number' => $face['auto_each_number']
                     ];
                     Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
                     $ticket = new TicketJob($data['recruit_id'],'face',$ticket_data);

app/Jobs/TicketJob.php

@@ -178,8 +178,8 @@ class TicketJob implements ShouldQueue
                     return;
                 }
                 if(empty($recruit->interview_start)){
-                    $interview_start = date("Y-m-d H:i:s",strtotime("+1 days",strtotime(date("Y-m-d",time()))));
-                    $interview_end = date("Y-m-d H:i:s",strtotime("+5 days",strtotime(date("Y-m-d",time()))));
+                    $interview_start = $this->data['ex_start'];
+                    $interview_end = $this->data['ex_end'];
                 }else{
                     $interview_start = date("Y-m-d H:i:s",strtotime("-5 days",strtotime($recruit->interview_start)));
                     $interview_end = date("Y-m-d H:i:s",strtotime("+1 days",strtotime($recruit->interview_end)));

resources/views/admin/recruit/ajax_ticket.blade.php

@@ -97,8 +97,6 @@
                                                     <input type="text" name="pen[ex_end]" value="" class="form-control ex_end" style="width: 200px"></div>
                                             </div>
                                         </div>
-
-
                                     </div>
                                 </div>
                                 <div id="pen_autoCreate">
@@ -187,6 +185,24 @@
                                         </label>
                                     </div>
                                 </div>
+                                <div class="form-group  ">
+                                    <label for="apply_start" class="col-sm-2 astrisk control-label">打印时间段</label>
+                                    <div class="col-sm-8">
+                                        <div class="row" style="width: 470px">
+                                            <div class="col-lg-6">
+                                                <div class="input-group">
+                                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                                    <input type="text" name="face[ex_start]" value="" class="form-control ex_start" style="width: 200px"></div>
+                                            </div>
+
+                                            <div class="col-lg-6">
+                                                <div class="input-group">
+                                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                                    <input type="text" name="face[ex_end]" value="" class="form-control ex_end" style="width: 200px"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div id="face_autoCreate" style="display: none">
                                     <div class="form-group">
                                         <label for="auto_each_number" class="col-sm-2 control-label">每间考场人数</label>