面试准考证电话

app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -105,8 +105,20 @@ class RecruitTicketController extends Controller
         if(empty($recruit)){
             return response()->json(['status' => 0, 'msg' => '找不到对应招考场次'], 200);
         }
+        $type = $request->input('type');
+        switch ($type)
+        {
+            case 'pen':
+                $list = RecruitAppointInfo::where('recruit_id',$recruit_id)->where('audit',3)->where('pen_audit',-1)->orderBy('post_id','asc')->get();
+                break;
+            case 'face':
+                $list = RecruitAppointInfo::where('recruit_id',$recruit_id)->where('audit',3)->where(function($query){
+                    $query->where('pen_audit',1)
+                          ->orWhere('pen_audit',3);
+                })->orderBy('post_id','asc')->get();
+                break;
+        }
 
-        $list = RecruitAppointInfo::where('recruit_id',$recruit_id)->where('audit',3)->where('pen_audit',-1)->orderBy('post_id','asc')->get();
         $post_data = RecruitPost::where('recruit_id',$recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
         $data = [];
         foreach ($list as $k => $v){

app/Jobs/TicketJob.php

@@ -152,9 +152,19 @@ class TicketJob implements ShouldQueue
                 if(!$recruit->face_ticket_content){
                     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()))));
+                }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)));
+                }
                 switch ($this->data['type']){
                     case '0'://不需要额外数据
-                        $list = RecruitAppointInfo::where('recruit_id',$this->recruit_id)->where('audit',3)->where('pen_audit',1)->where('face_audit',-1)->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
+                        $list = RecruitAppointInfo::where('recruit_id',$this->recruit_id)->where('audit',3)->where('face_audit',-1)->where(function($query){
+                            $query->where('pen_audit',1)
+                                  ->orWhere('pen_audit',3);
+                        })->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
                         $post_data = RecruitPost::where('recruit_id',$this->recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                         if($list){
                             foreach ($list as $k => $v){
@@ -172,8 +182,8 @@ class TicketJob implements ShouldQueue
                                     'appoint_id' => $v['id'],
                                     'ex_type' => 3,
                                     'ex_status' => 1,
-                                    'ex_start' => '2021-05-10 00:00:00',
-                                    'ex_end' => '2021-05-15 23:59:59'
+                                    'ex_start' => $interview_start,
+                                    'ex_end' => $interview_end
                                 ];
                                 RecruitTicket::create($ticket);
                                 $this->fetch($item,$recruit->face_ticket_content, 'face', $recruit);

public/themes/default/views/app/recruit/show.blade.php

@@ -173,7 +173,7 @@
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">10.共同居住家庭成员中有上述1至7的情况。</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 43px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">特别提示：</span><span style="font-family: 微软雅黑;color: rgb(255, 0, 0);letter-spacing: 0;font-size: 16px"><span style="font-family:微软雅黑">存在以上情形的，考试报到时应主动提交</span><span style="font-family:微软雅黑">7天内（5月15日后）核酸检测阴性报告单。</span></span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">特别提示：</span><span style="font-family: 微软雅黑;color: rgb(255, 0, 0);letter-spacing: 0;font-size: 16px"><span style="font-family:微软雅黑">存在以上情形的，考试报到时应主动提交</span><span style="font-family:微软雅黑">7天内（6月12日后）核酸检测阴性报告单。</span></span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
                 <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺：</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">如因隐瞒或虚假填报引起检疫传染病传播或者有传播严重危险而影响公共安全的后果，本人将承担相应的法律责任，自愿接受《中华人民共和国刑法》《治安管理处罚法》《传染病防治法》和《关于依法惩治妨害新型冠状病毒感染肺炎疫情防控违法犯罪的意见》等法律法规的处罚和制裁。</span>

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

@@ -61,7 +61,7 @@
                                         5.自动生成准考证仅能从准考证号、考室号、座位号三个进行生成，其余字段请确保模板中已存在。
                                     </p>
                                     <p>
-                                        6.<a href="{{ route('recruit.ticket_data_template',['recruit_id' => $recruit->id]) }}" target="_blank">点我下载</a>准考证导入信息模板。
+                                        6.<a href="{{ route('recruit.ticket_data_template',['recruit_id' => $recruit->id,'type' => 'pen']) }}" target="_blank">点我下载</a>准考证导入信息模板。
                                     </p>
                                     <p>
                                         7.每间考场人数的设置仅在选择自动生成模式时有效。
@@ -147,7 +147,7 @@
                                         5.自动生成准考证仅能从准考证号、考室号、座位号三个进行生成，其余字段请确保模板中已存在。
                                     </p>
                                     <p>
-                                        6.<a href="{{ route('recruit.ticket_data_template',['recruit_id' => $recruit->id]) }}" target="_blank">点我下载</a>准考证导入信息模板。
+                                        6.<a href="{{ route('recruit.ticket_data_template',['recruit_id' => $recruit->id,'type' => 'face']) }}" target="_blank">点我下载</a>准考证导入信息模板。
                                     </p>
                                     <p>
                                         7.每间考场人数的设置仅在选择自动生成模式时有效。