sandm 3 vuotta sitten
vanhempi
commit
f0e85749dc

+ 16 - 8
app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -207,15 +207,23 @@ class RecruitTicketController extends Controller
                     $list = RecruitAppointInfo::where('recruit_id',$data['recruit_id'])->where('audit',3)->where('pen_audit',-1)->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
                     //$post_data = RecruitPost::where('recruit_id',$data['recruit_id'])->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                     $list = array_chunk($list,$pen['auto_each_number'],true);
-                    $ticket_data = [
-                        'type' => 1,
-                        'list' => $list,
-                        'ex_start' => $pen['ex_start'],
-                        'ex_end' => $pen['ex_end']
-                    ];
+                    if($list){
+                        foreach ($list as $room => $room_list){
+                            if(is_array($room_list)){
+                                $ticket_data = [
+                                    'type' => 1,
+                                    'list' => $room_list,
+                                    'room' => $room,
+                                    'ex_start' => $pen['ex_start'],
+                                    'ex_end' => $pen['ex_end']
+                                ];
+                                $ticket = new TicketJob($data['recruit_id'],'pen',$ticket_data);
+                                dispatch($ticket);
+                            }
+                        }
+                    }
+
                     Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 2]);
-                    $ticket = new TicketJob($data['recruit_id'],'pen',$ticket_data);
-                    dispatch($ticket);
                     return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
                     break;
                 case '2':

+ 5 - 4
app/Jobs/TicketJob.php

@@ -59,9 +59,10 @@ class TicketJob implements ShouldQueue
                         //$list = RecruitAppointInfo::where('recruit_id',$this->recruit_id)->where('audit',3)->where('pen_audit',-1)->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');
                         $list = $this->data['list'];//array_chunk($list,$this->data['auto_each_number'],true);
-                        foreach ($list as $room => $room_list){
-                            if(is_array($room_list)){
-                                foreach ($room_list as $k => $v){
+                        //foreach ($list as $room => $room_list){
+                            if(is_array($list)){
+                                $room = $this->data['room'];
+                                foreach ($list as $k => $v){
                                     $seat = $k + 1;
                                     $item = [
                                         'realname' => $v['realname'],
@@ -86,7 +87,7 @@ class TicketJob implements ShouldQueue
                                     $this->fetch($item,$recruit->pen_ticket_content, 'pen', $recruit);
                                 }
                             }
-                        }
+                        //}
                         //$this->pdf('pen',$recruit);
                         //Recruit::where('id',$this->recruit_id)->update(['pen_ticket_status' => 2]);
                         break;