Procházet zdrojové kódy

更新面试准考证功能

sandm před 2 roky
rodič
revize
cc4a601e3f

+ 2 - 0
.gitignore

@@ -18,3 +18,5 @@ horizon.log
 /.env.server.example
 /composer.lock
 /package.json
+database
+online2020m

+ 4 - 1
app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -356,7 +356,10 @@ class RecruitTicketController extends Controller
                                 'ex_time' => $sheet->getCell("H{$row}")->getValue(),
                                 'ex_name' => $sheet->getCell("I{$row}")->getValue(),
                                 'ex_address' => $sheet->getCell("J{$row}")->getValue(),
-                                'ex_ready_time' => $sheet->getCell("K{$row}")->getValue()
+                                'ex_ready_time' => $sheet->getCell("K{$row}")->getValue(),
+                                'extra1' => $sheet->getCell("L{$row}")->getValue(),
+                                'extra2' => $sheet->getCell("M{$row}")->getValue(),
+                                'extra3' => $sheet->getCell("N{$row}")->getValue()
                             ];
                         }
                         Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);

+ 5 - 1
app/Http/Controllers/Web/Recruit/IndexController.php

@@ -1292,6 +1292,10 @@ class IndexController extends WebBaseController
         if($appoint_info){
             $face_ticket = RecruitTicket::where('appoint_id',$appoint_info->id)->where('ex_type',3)->first();
             if($face_ticket){
+                $health = RecruitSupplement::where('appoint_id',$appoint_info->id)->first();
+                if(!$health || $health->h_status == 0){
+                    return $this->showMessage('健康审核信息未通过!', route('home'), true, '上一页', '3');
+                }
                 $time = time();
                 if(strtotime($face_ticket->ex_start) < $time && strtotime($face_ticket->ex_end) > $time){
                     RecruitTicket::where('id',$face_ticket->id)->update(['ex_status' => 1]);
@@ -1629,7 +1633,7 @@ class IndexController extends WebBaseController
         }
 
         $time = time();
-        if($time > 1654830000){//手动截止
+        if($time > 1655438400){//手动截止
             return $this->showMessage('抱歉,考察审核端口已关闭!', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
         }