合并分支 'lyh-server' 到 'master'

工单小时搜索



查看合并请求 !2688

@@ -58,6 +58,25 @@ class AsideTicketController extends BaseController
                 }
 
             })
+            ->when($request->input('timeout') !== null, function ($query) use ($request) {
+                // status 查 gl_tickets.status
+                $timeout = $request->input('timeout');
+                switch ($timeout) {
+                    case 1:
+                        $newTime = date("Y-m-d H:i:s", strtotime("-24 hours"));
+                        break;
+                    case 2:
+                        $newTime = date("Y-m-d H:i:s", strtotime("-48 hours"));
+                        break;
+                    case 3:
+                        $newTime = date("Y-m-d H:i:s", strtotime("-72 hours"));
+                        break;
+                    default:
+                        $newTime = date("Y-m-d H:i:s");
+                        break;
+                }
+                return $query->where('status', 0)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
+            })
             ->when($request->input('star') !== null, function ($query) use ($request) {
                 $star = $request->input('star');
                 return $query->where('star', $star);
@@ -107,6 +126,17 @@ class AsideTicketController extends BaseController
         $query->orderBy($sortField, $sortOrder);
         if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
         $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
+        foreach ($lists['list'] as $key => $item){
+            //计算超时多少个小时
+            if($item['status'] == 0){
+                $end = date('Y-m-d H:i:s');
+                $start = $item['plan_end_at'];
+                if($start < $end){
+                    $item['plan_ent_time'] =  diffInHours($start,$end);
+                }
+            }
+            $lists['list'][$key] = $item;
+        }
         $this->response('success', Code::SUCCESS, $lists);
     }