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

@@ -132,6 +132,9 @@ class TicketCount extends Command
                 $timeout_ratio = round($timeout_num / $ticket_num, 3);
                 $timeout_ratio = round($timeout_num / $ticket_num, 3);
             }
             }
             $date = date('Y-m-d');
             $date = date('Y-m-d');
+            if(!empty($complete_num)){
+                $complete_ratio = round($complete_num / $ticket_num, 2);
+            }
             $data = [
             $data = [
                 'date'=>$date,
                 'date'=>$date,
                 'manage_id'=>$item['id'],
                 'manage_id'=>$item['id'],
@@ -143,7 +146,7 @@ class TicketCount extends Command
                 'complete_num'=>$complete_num,//完成工单数量
                 'complete_num'=>$complete_num,//完成工单数量
                 'dept_id'=>$item['dept_id'],
                 'dept_id'=>$item['dept_id'],
                 'timeout_ratio'=>$timeout_ratio ?? null,
                 'timeout_ratio'=>$timeout_ratio ?? null,
-                'complete_ratio'=>round($timeCount / $complete_num, 2)
+                'complete_ratio'=>$complete_ratio ?? null
             ];
             ];
             //查询当前用户是否当日已有记录
             //查询当前用户是否当日已有记录
             $ticketManageInfo = $ticketManageCountModel->read(['date'=>$date,'manage_id'=>$item['id']],['id']);
             $ticketManageInfo = $ticketManageCountModel->read(['date'=>$date,'manage_id'=>$item['id']],['id']);

@@ -50,13 +50,12 @@ 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'){
+                if($status == 10){
                     $newTime = date("Y-m-d H:i:s", strtotime("-120 hours"));
                     $newTime = date("Y-m-d H:i:s", strtotime("-120 hours"));
                     return $query->where('status', 0)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
                     return $query->where('status', 0)->where('plan_end_at','<',$newTime);//超过120个小时未处理的工单
                 }else{
                 }else{
                     return $query->where('status', $status);
                     return $query->where('status', $status);
                 }
                 }
-
             })
             })
             ->when($request->input('timeout') !== null, function ($query) use ($request) {
             ->when($request->input('timeout') !== null, function ($query) use ($request) {
                 // status 查 gl_tickets.status
                 // status 查 gl_tickets.status
@@ -132,7 +131,7 @@ class AsideTicketController extends BaseController
         }
         }
         //搜索提交人姓名
         //搜索提交人姓名
         if(!empty($this->param['submit_username'])){
         if(!empty($this->param['submit_username'])){
-            return $query->where('submit_username','%'.$this->param['submit_username'].'%');
+            return $query->where('submit_username','like','%'.$this->param['submit_username'].'%');
         }
         }
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');

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