diff --git a/app/Domains/Stats/Http/Controllers/SoldActivatedController.php b/app/Domains/Stats/Http/Controllers/SoldActivatedController.php index 90aa5235..4671ad4a 100644 --- a/app/Domains/Stats/Http/Controllers/SoldActivatedController.php +++ b/app/Domains/Stats/Http/Controllers/SoldActivatedController.php @@ -63,7 +63,14 @@ class SoldActivatedController extends Controller $query = $query->where('company_id', $conditions['company_id']); } - $list = $query->get()->groupBy('company_id'); + $list = $query->get(); + + if (!empty($list)) { + $maxMonth = max($list->pluck('activated_month')->toArray()); + $maxMonth = Carbon::parse($maxMonth); + } + + $list = $list->groupBy('company_id'); $res = []; @@ -80,7 +87,7 @@ class SoldActivatedController extends Controller $res[$company_id][$month]['order_month'] = $month; $res[$company_id][$month]['sells'] = 0; - for ($j=0; $j <= $endtime->diffInMonths($starttime); $j++) { + for ($j=0; $j <= $maxMonth->diffInMonths($starttime); $j++) { $m = $starttime->copy()->addMonths($j)->format('Y-m'); $item = $monthList[$m] ?? []; diff --git a/frontend/src/views/stats/sold-activated/index.vue b/frontend/src/views/stats/sold-activated/index.vue index 5780fc08..ce9bd096 100644 --- a/frontend/src/views/stats/sold-activated/index.vue +++ b/frontend/src/views/stats/sold-activated/index.vue @@ -53,6 +53,9 @@
{{message}}
\n选择图标
\n\n{{message}}
\n选择图标
\n\n{{message}}
\n选择图标
\n\n{{CONFIG.title}}
\n \n{{CONFIG.title}}
\n \n{{CONFIG.title}}
\n \n