合并分支 'akun' 到 'master'

Akun



查看合并请求 !3066

@@ -530,6 +530,7 @@ class InquiryForwardLogic extends BaseLogic
 
         //月统计
         $data_month = [];
+        $data_month_total = [];
         $now_month = date('Y-m');
         $last_year_month = date('Y-m', strtotime('-11 months'));
         while ($last_year_month <= $now_month) {
@@ -540,15 +541,18 @@ class InquiryForwardLogic extends BaseLogic
             foreach ($manage_ids as $mid) {
                 $name = $manageModel->getName($mid);
                 $month_count = intval(ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->sum('count') ?? 0);
-                $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'));
         }
+        $data_month['total'] = $data_month_total;
+
 
         //周统计
         $data_week = [];
+        $data_week_total = [];
         $now_day = date('Y-m-d');
         $last_week_day = date('Y-m-d', strtotime('-1 week'));
         while ($last_week_day < $now_day) {
@@ -560,12 +564,13 @@ class InquiryForwardLogic extends BaseLogic
             foreach ($manage_ids as $mid) {
                 $name = $manageModel->getName($mid);
                 $day_count = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0;
-                $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'));
         }
+        $data_week['total'] = $data_week_total;
 
         return $this->success(['data_month' => $data_month, 'data_week' => $data_week]);
     }