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

超过120小时未处理的工单



查看合并请求 !2706

@@ -50,7 +50,7 @@ class AsideTicketController extends BaseController
             ->when($request->input('status') !== null, function ($query) use ($request) {
                 // status 查 gl_tickets.status
                 $status = $request->input('status');
-                if($status == '-1'){
+                if($status == 10){
                     $newTime = date("Y-m-d H:i:s", strtotime("-120 hours"));
                     return $query->where('status', 0)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
                 }else{

@@ -25,7 +25,7 @@ class AsideTicketListRequest extends FormRequest
     {
         return [
             'project_id' => 'nullable|string',
-            'status' => 'nullable|in:0,1,2,3,9|integer',
+            'status' => 'nullable|in:0,1,2,3,9,10|integer',
             'star' => 'nullable|in:1,2,3|integer',
             'search' => 'nullable|string', // 搜索关键词
             'engineer_id' => 'nullable|integer', // 工程师ID