diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e10bbdd..8d51665 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -78,30 +78,32 @@ class AppServiceProvider extends ServiceProvider { view()->composer('layouts.app', function($view){ + // 未対応のみ集計 $stats = DB::table('operator_que') ->selectRaw(" - SUM(CASE WHEN que_status IN (1,2) AND que_class < 100 THEN 1 ELSE 0 END) AS task_total, - MAX(CASE WHEN que_status IN (1,2) AND que_class < 100 THEN created_at END) AS task_latest, - SUM(CASE WHEN que_status IN (1,2) AND que_class > 99 THEN 1 ELSE 0 END) AS hard_total, - MAX(CASE WHEN que_status IN (1,2) AND que_class > 99 THEN created_at END) AS hard_latest + SUM(CASE WHEN que_status = 1 AND que_class < 100 THEN 1 ELSE 0 END) AS task_untreated, + MAX(CASE WHEN que_status = 1 AND que_class < 100 THEN created_at END) AS task_latest, + SUM(CASE WHEN que_status = 1 AND que_class > 99 THEN 1 ELSE 0 END) AS hard_untreated, + MAX(CASE WHEN que_status = 1 AND que_class > 99 THEN created_at END) AS hard_latest ") ->first(); - $taskCount = (int)($stats->task_total ?? 0); - $hardCount = (int)($stats->hard_total ?? 0); + // 変数名は互換維持(内容は未対応件数) + $taskCount = (int)($stats->task_untreated ?? 0); + $hardCount = (int)($stats->hard_untreated ?? 0); $taskLatest = $stats->task_latest ?? null; $hardLatest = $stats->hard_latest ?? null; - // 最新5件 (未対応/作業中) + // ドロップダウン最新5件 も未対応のみ $latestTasks = DB::table('operator_que') - ->whereIn('que_status',[1,2]) + ->where('que_status',1) ->where('que_class','<',100) ->orderByDesc('created_at') ->limit(5) ->get(); $latestHards = DB::table('operator_que') - ->whereIn('que_status',[1,2]) + ->where('que_status',1) ->where('que_class','>',99) ->orderByDesc('created_at') ->limit(5) diff --git a/resources/views/admin/information/list.blade.php b/resources/views/admin/information/list.blade.php index 9715d08..05b04b8 100644 --- a/resources/views/admin/information/list.blade.php +++ b/resources/views/admin/information/list.blade.php @@ -198,9 +198,58 @@ -