sandm 1 жил өмнө
parent
commit
d338e21b22

+ 3 - 3
app/Jobs/TicketJob.php

@@ -123,12 +123,12 @@ class TicketJob implements ShouldQueue
                         $ticket_data_list = $this->data['list'];
                         $ticket_data_list = $this->data['list'];
                         $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();
                         $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')->toArray();
                         $post_data = RecruitPost::where('recruit_id',$this->recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id')->toArray();
-                        if(empty($recruit->preliminary_start)){
+                        if(!array_key_exists('ex_start',$this->data) || !array_key_exists('ex_end',$this->data) || empty($this->data['ex_start']) || empty($this->data['ex_end'])){
                             $preliminary_start = date("Y-m-d H:i:s",strtotime("+1 days",strtotime(date("Y-m-d",time()))));
                             $preliminary_start = date("Y-m-d H:i:s",strtotime("+1 days",strtotime(date("Y-m-d",time()))));
                             $preliminary_end = date("Y-m-d H:i:s",strtotime("+5 days",strtotime(date("Y-m-d",time()))));
                             $preliminary_end = date("Y-m-d H:i:s",strtotime("+5 days",strtotime(date("Y-m-d",time()))));
                         }else{
                         }else{
-                            $preliminary_start = date("Y-m-d H:i:s",strtotime("-5 days",strtotime($recruit->preliminary_start)));
-                            $preliminary_end = date("Y-m-d H:i:s",strtotime("+1 days",strtotime($recruit->preliminary_start)));
+                            $preliminary_start = $this->data['ex_start'];
+                            $preliminary_end = $this->data['ex_end'];
                         }
                         }
                         foreach ($list as $k => $v){
                         foreach ($list as $k => $v){
                             if(!array_key_exists($v['post_id'],$post_data)){
                             if(!array_key_exists($v['post_id'],$post_data)){