未续费项目增加搜索

@@ -80,15 +80,15 @@ class TicketCount extends Command
             $timeout_ratio = null;
             $timeout_ratio = null;
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
             $ticketLogModel = new TicketLog();
             $ticketLogModel = new TicketLog();
-            $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
+            $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'status'=>['!=',9]]);
             //工单总时长
             //工单总时长
-            $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1])->sum('end_time');
-            $complete_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]]);
+            $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'status'=>['!=',9]])->sum('end_time');
+            $complete_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['!=',null]]);
             if(!empty($timeCount)){
             if(!empty($timeCount)){
                 $average_time = round($timeCount / $complete_num, 3);
                 $average_time = round($timeCount / $complete_num, 3);
             }
             }
             //最快完成的时间
             //最快完成的时间
-            $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
+            $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
             //最快完成时间
             //最快完成时间
             if(!$fastest_time){
             if(!$fastest_time){
                 $fastest_time = null;
                 $fastest_time = null;
@@ -97,6 +97,7 @@ class TicketCount extends Command
             $timeout_num = $ticketLogModel
             $timeout_num = $ticketLogModel
                 ->where('engineer_id', $item['manage_id'])
                 ->where('engineer_id', $item['manage_id'])
                 ->where('is_engineer', 1)
                 ->where('is_engineer', 1)
+                ->where('status','!=',9)
                 ->where(function ($query) {
                 ->where(function ($query) {
                     $query->where(function ($q) {
                     $query->where(function ($q) {
                         $q->whereNotNull('end_at')
                         $q->whereNotNull('end_at')
@@ -153,9 +154,9 @@ class TicketCount extends Command
             $average_time = null;
             $average_time = null;
             $timeout_ratio = null;
             $timeout_ratio = null;
             $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
             $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
-            $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>1,'dept_id'=>1],'manage_id');
-            $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1]);
-            $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1])->sum('end_time');
+            $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>['!=',9],'status'=>1,'dept_id'=>1],'manage_id');
+            $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1,'status'=>['!=',9]]);
+            $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>['in',$manageIdArr],'status'=>['!=',9],'is_engineer'=>1])->sum('end_time');
             if(!empty($timeCount)){
             if(!empty($timeCount)){
                 $average_time = round($timeCount / $ticket_num, 3);
                 $average_time = round($timeCount / $ticket_num, 3);
             }
             }
@@ -163,6 +164,7 @@ class TicketCount extends Command
             $timeout_num = $ticketLogModel
             $timeout_num = $ticketLogModel
                 ->whereIn('engineer_id', $manageIdArr)
                 ->whereIn('engineer_id', $manageIdArr)
                 ->where('is_engineer', 1)
                 ->where('is_engineer', 1)
+                ->where('status','!=',9)//排除掉作废工单
                 ->where(function ($query) {
                 ->where(function ($query) {
                     $query->where(function ($q) {
                     $query->where(function ($q) {
                         $q->whereNotNull('end_at')
                         $q->whereNotNull('end_at')
@@ -223,7 +225,7 @@ class TicketCount extends Command
             )
             )
             ->groupBy('p.project_cate')
             ->groupBy('p.project_cate')
             ->pluck('ticket_count', 'project_cate');
             ->pluck('ticket_count', 'project_cate');
-        $timeout_num = $ticketModel
+        $timeout_num = $ticketModel->where('status','!=',9)
             ->where(function ($query) {
             ->where(function ($query) {
                 $query->where(function ($q) {
                 $query->where(function ($q) {
                     $q->whereNotNull('end_at')
                     $q->whereNotNull('end_at')