Merge remote-tracking branch 'origin/master' into akun

@@ -174,7 +174,7 @@ class VideoTask extends Command
                 'is_ytb'=>false,
                 'is_ytb'=>false,
                 'other_language_subtitle'=>false
                 'other_language_subtitle'=>false
             ];
             ];
-            $result = Http::post('http://216.250.255.116:7866/create_task', $data);
+            $result = Http::post('http://216.250.255.116:7866/create_task', $data);//todo::小天的接口
             $res_json = json_decode($result,true);
             $res_json = json_decode($result,true);
             $val->task_id = $task_id;
             $val->task_id = $task_id;
             $val->status = KeywordVideoTaskLog::STATUS_ERROR;
             $val->status = KeywordVideoTaskLog::STATUS_ERROR;

@@ -56,7 +56,7 @@ class TicketController extends BaseController
             'end.required' => 'end不能为空',
             'end.required' => 'end不能为空',
         ]);
         ]);
         $dailyModel = new TicketDailyCount();
         $dailyModel = new TicketDailyCount();
-        $dailyList = $dailyModel->list(['date'=>['between',[$this->param['start'],$this->param['end']]]],'date',['*'],'desc',30);//取最近5条数据
+        $dailyList = $dailyModel->list(['date'=>['between',[$this->param['start'],$this->param['end']]]],'date',['*'],'desc',30);//取最近30条数据
         $this->response('success',Code::SUCCESS,$dailyList);
         $this->response('success',Code::SUCCESS,$dailyList);
     }
     }
     /**
     /**

@@ -50,7 +50,13 @@ class AsideTicketController extends BaseController
             ->when($request->input('status') !== null, function ($query) use ($request) {
             ->when($request->input('status') !== null, function ($query) use ($request) {
                 // status 查 gl_tickets.status
                 // status 查 gl_tickets.status
                 $status = $request->input('status');
                 $status = $request->input('status');
+                if($status == '-1'){
+                    $newTime = date("Y-m-d H:i:s", strtotime("-120 hours"));
+                    return $query->where('status', 0)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
+                }else{
                     return $query->where('status', $status);
                     return $query->where('status', $status);
+                }
+
             })
             })
             ->when($request->input('star') !== null, function ($query) use ($request) {
             ->when($request->input('star') !== null, function ($query) use ($request) {
                 $star = $request->input('star');
                 $star = $request->input('star');
@@ -92,6 +98,7 @@ class AsideTicketController extends BaseController
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
             return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
         }
         }
+
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');
 //        $query->orderBy('id', 'desc');
 //        $query->orderBy('id', 'desc');