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

未续费项目增加搜索



查看合并请求 !2654

@@ -199,7 +199,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->counts(['end_at'=>null,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
+        $timeout_num = $ticketModel->counts(['plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
         $timeout_ratio = null;
         $timeout_ratio = null;
         if(!empty($timeout_num)){
         if(!empty($timeout_num)){
             $timeout_ratio = round($timeout_num / $ticket_num, 3);
             $timeout_ratio = round($timeout_num / $ticket_num, 3);