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

Lyh server



查看合并请求 !2561

@@ -19,6 +19,7 @@ use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
 use App\Models\WorkOrder\Tickets;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 
 
 class TicketCount extends Command
 class TicketCount extends Command
@@ -173,6 +174,13 @@ class TicketCount extends Command
         $processed_num = $ticketModel->counts(['end_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);
         $processed_num = $ticketModel->counts(['end_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);
         $submit_a_side = $ticketModel->formatQuery(['submit_side'=>1])->sum('submit_side');
         $submit_a_side = $ticketModel->formatQuery(['submit_side'=>1])->sum('submit_side');
         $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
         $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
+        $dbResult = DB::table('gl_ticket_projects as p')->leftJoin('gl_tickets as t', 'p.id', '=', 't.project_id')
+            ->select(
+                'p.project_cate',
+                DB::raw('COUNT(t.id) as ticket_count')
+            )
+            ->groupBy('p.project_cate')
+            ->pluck('ticket_count', 'project_cate');
         $data = [
         $data = [
             'date' => $date,
             'date' => $date,
             'ticket_num'=>$ticket_num,
             'ticket_num'=>$ticket_num,
@@ -181,6 +189,7 @@ class TicketCount extends Command
             'processed_num'=>$processed_num,
             'processed_num'=>$processed_num,
             'average_time'=>$average_time ?? '',
             'average_time'=>$average_time ?? '',
             'source'=>json_encode(['a'=>$submit_a_side,'b'=>$submit_b_side],true),
             'source'=>json_encode(['a'=>$submit_a_side,'b'=>$submit_b_side],true),
+            'source_type'=>json_encode($dbResult,true)
         ];
         ];
         $ticketDailyModel = new TicketDailyCount();
         $ticketDailyModel = new TicketDailyCount();
         $ticketDailyInfo = $ticketDailyModel->read(['date'=>$date],['id']);
         $ticketDailyInfo = $ticketDailyModel->read(['date'=>$date],['id']);