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

gx工单系统



查看合并请求 !2546

@@ -87,8 +87,8 @@ class TicketCount extends Command
             //最快完成的时间
             $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
             //超时工单数量
-            $timeout_num = $ticketLogModel->counts(['end_at'=>null,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
-            $complete_num = $ticketLogModel->counts(['end_at'=>['!=',null]]);
+            $timeout_num = $ticketLogModel->counts(['end_at'=>null,'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
+            $complete_num = $ticketLogModel->counts(['end_at'=>['!=',null],'engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
             $data = [
                 'date'=>$date,
                 'manage_id'=>$item['id'],