Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

app/Admin/Controllers/Recruit/RecruitController.php

@@ -2574,7 +2574,7 @@ class RecruitController extends Controller
             ->get();
         $data = [];
         foreach ($list as $k => $v){
-            $place = $v->ex_place == null ? 'empty' : $v->ex_place;
+            $place = $v->ex_place == null ? "第{$v->ex_room}考场" : $v->ex_place;
             if(!array_key_exists($place,$data)){
                 $data[$place] = [];
             }
@@ -2606,7 +2606,7 @@ class RecruitController extends Controller
             ->get();
         $data = [];
         foreach ($list as $k => $v){
-            $place = $v->ex_place == null ? 'empty' : $v->ex_place;
+            $place = $v->ex_place == null ? "第{$v->ex_room}考场" : $v->ex_place;
             if(!array_key_exists($place,$data)){
                 $data[$place] = [];
             }

app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -210,6 +210,9 @@ class RecruitTicketController extends Controller
                     if(!array_key_exists('auto_each_number',$pen) || empty($pen['auto_each_number'])){
                         return response()->json(['status' => 0, 'msg' => '请输入每间考试的人员数量'], 200);
                     }
+                    if(!array_key_exists('auto_number_prefix',$pen) || empty($pen['auto_number_prefix'])){
+                        return response()->json(['status' => 0, 'msg' => '请输入准考证号前缀'], 200);
+                    }
                 }
                 if(!array_key_exists('ex_start',$pen) || empty($pen['ex_start'])){
                     return response()->json(['status' => 0, 'msg' => '准考证开启打印时间不能为空'], 200);
@@ -236,6 +239,7 @@ class RecruitTicketController extends Controller
                                         'multiple' => 0,
                                         'list' => $room_list,
                                         'room' => $room,
+                                        'number_prefix' => $pen['auto_number_prefix'],
                                         'ex_start' => $pen['ex_start'],
                                         'ex_end' => $pen['ex_end']
                                     ];
@@ -252,6 +256,7 @@ class RecruitTicketController extends Controller
                                     'type' => 1,
                                     'multiple' => 1,
                                     'list' => $v,
+                                    'number_prefix' => $pen['auto_number_prefix'],
                                     'ex_start' => $pen['ex_start'],
                                     'ex_end' => $pen['ex_end']
                                 ];

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -1525,6 +1525,7 @@ class IndexController extends WebBaseController
                     //$filename = $date . '_' . $appoint_info->realname . '_' . $appoint_info->card . '_' . $post_data[$appoint_info->post_id];
                     $filename = sha1($date . '_' . $appoint_info->realname . '_' . $appoint_info->card . '_' . $post_data[$appoint_info->post_id]);
                     $file = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/pen/" . $filename . '.pdf';
+
                     if(file_exists($file)){
                         header('Content-Description: File Transfer');
                         header('Content-Type: application/octet-stream');
@@ -1537,6 +1538,8 @@ class IndexController extends WebBaseController
                         ob_clean();   //重要的就是这个函数的调用， 清空但不关闭输出缓存， 否则下载的文件头两个字符会是0a
                         flush();
                         readfile($file);
+                    }else{
+                        return $this->showMessage('准考证不存在，请联系管理员！', route('home'), true, '上一页', '3');
                     }
                 }else{
                     return $this->showMessage('非打印时间！', route('home'), true, '上一页', '3');

app/Jobs/TicketJob.php

@@ -66,7 +66,7 @@ class TicketJob implements ShouldQueue
                                     $seat = ($k%30) + 1;
                                     $item = [
                                         'realname' => $v['realname'],
-                                        'ex_number' => date("Y",time()) . '0101201' . sprintf("%02d",($room+1)) . sprintf("%02d",$seat),
+                                        'ex_number' => $this->data['number_prefix'] . sprintf("%02d",($room+1)) . sprintf("%02d",$seat),
                                         'card' => $v['card'],
                                         'post' => $post_data[$v['post_id']],
                                         'ex_room' => sprintf("%02d",($room+1)),
@@ -93,7 +93,7 @@ class TicketJob implements ShouldQueue
                                 $seat = ($k%30) + 1;
                                 $item = [
                                     'realname' => $v['realname'],
-                                    'ex_number' => date("Y",time()) . '0101101' . sprintf("%02d",($room+1)) . sprintf("%02d",$seat),
+                                    'ex_number' => $this->data['number_prefix'] . sprintf("%02d",($room+1)) . sprintf("%02d",$seat),
                                     'card' => $v['card'],
                                     'post' => $post_data[$v['post_id']],
                                     'ex_room' => sprintf("%02d",($room+1)),

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

@@ -119,6 +119,15 @@
                                     </div>
                                 </div>
                                 <div id="pen_autoCreate">
+                                    <div class="form-group">
+                                        <label for="auto_number_prefix" class="col-sm-2 astrisk control-label">准考证号前缀</label>
+                                        <div class="col-sm-5">
+                                            <div class="input-group">
+                                                <span class="input-group-addon"><i class="fa fa-pencil fa-fw"></i></span>
+                                                <input type="text" id="auto_number_prefix" name="pen[auto_number_prefix]" value="" class="form-control auto_number_prefix" placeholder="准考证号前缀，不含考室与座位号">
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="form-group">
                                         <label for="auto_each_number" class="col-sm-2 control-label">每间考场人数</label>
                                         <div class="col-sm-5">
@@ -128,6 +137,7 @@
                                             </div>
                                         </div>
                                     </div>
+
                                 </div>
                                 <div id="pen_fetchCreate" style="display: none">
                                     <div class="form-group  ">

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

@@ -18,12 +18,15 @@
             text-align: center;
         }
         .print .list .item{
-            width: 240px;
+            width: 280px;
             text-align: center;
             line-height: 40px;
             font-weight: bold;
             font-size: 19px;
             float: left;
+            margin: 0 10px 30px;
+            padding: 10px 0;
+            border: 1px solid #ccc;
         }
         .print .list .item .avatar{
             width: 180px;
@@ -41,7 +44,7 @@
         @foreach($v as $kk => $vv)
         <div class="room clearfix">
             <div class="print">
-                <div class="list">
+                <div class="list" style="padding-top:30px">
                     @foreach($vv as $key => $val)
                         <div class="item">
                             <div class="avatar">

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

@@ -38,7 +38,7 @@
     @foreach($v as $kk => $vv)
     <div class="room clearfix">
         <h2>
-            考生进出考场签到表
+            {{ $k }} 考生进出考场签到表
         </h2>
         <div class="list">
             @foreach($vv as $key => $val)