合并分支 'akun' 到 'master'

update



查看合并请求 !3065

@@ -540,8 +540,8 @@ class InquiryForwardLogic extends BaseLogic
             foreach ($manage_ids as $mid) {
             foreach ($manage_ids as $mid) {
                 $name = $manageModel->getName($mid);
                 $name = $manageModel->getName($mid);
                 $month_count = intval(ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0);
                 $month_count = intval(ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0);
-                $data_month[$last_year_month][$name] = $month_count;
                 $data_month['total'][$name] = ($data_month['total'][$name] ?? 0) + $month_count;
                 $data_month['total'][$name] = ($data_month['total'][$name] ?? 0) + $month_count;
+                $data_month[$last_year_month][$name] = $month_count;
             }
             }
 
 
             $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month'));
             $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month'));
@@ -560,8 +560,8 @@ class InquiryForwardLogic extends BaseLogic
             foreach ($manage_ids as $mid) {
             foreach ($manage_ids as $mid) {
                 $name = $manageModel->getName($mid);
                 $name = $manageModel->getName($mid);
                 $day_count = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0;
                 $day_count = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0;
-                $data_week[substr($last_week_day, 5)][$name] = $day_count;
                 $data_week['total'][$name] = ($data_week['total'][$name] ?? 0) + $day_count;
                 $data_week['total'][$name] = ($data_week['total'][$name] ?? 0) + $day_count;
+                $data_week[substr($last_week_day, 5)][$name] = $day_count;
             }
             }
 
 
             $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));
             $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));