合并分支 'akun' 到 'master'

Akun



查看合并请求 !3061

@@ -525,30 +525,11 @@ class InquiryForwardLogic extends BaseLogic
      */
     public function inquiryManageCount()
     {
-        $type = $this->param['type'] ?? 1;//统计类型：1周统计，2月统计
-
         $manage_ids = ForwardCount::select('manage_id')->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray();
         $manageModel = new Manage();
-        $data = [];
-        if ($type == 1) {
-            //周统计
-            $now_day = date('Y-m-d');
-            $last_week_day = date('Y-m-d', strtotime('-1 week'));
-            while ($last_week_day < $now_day) {
-                $day_arr = explode('-', $last_week_day);
-                $year = $day_arr[0];
-                $month = $day_arr[1];
-                $day = $day_arr[2];
-
-                foreach ($manage_ids as $mid) {
-                    $name = $manageModel->getName($mid);
-                    $data[substr($last_week_day, 5)][$name] = ForwardCount::where('manage_id', $mid)->where('year', $year)->where('month', $month)->where('day', $day)->value('count') ?? 0;
-                }
 
-                $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));
-            }
-        } else {
         //月统计
+        $data_month = [];
         $now_month = date('Y-m');
         $last_year_month = date('Y-m', strtotime('-11 months'));
         while ($last_year_month <= $now_month) {
@@ -558,13 +539,34 @@ class InquiryForwardLogic extends BaseLogic
 
             foreach ($manage_ids as $mid) {
                 $name = $manageModel->getName($mid);
-                    $data[$last_year_month][$name] = 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] += $month_count;
             }
 
             $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month'));
         }
+
+        //周统计
+        $data_week = [];
+        $now_day = date('Y-m-d');
+        $last_week_day = date('Y-m-d', strtotime('-1 week'));
+        while ($last_week_day < $now_day) {
+            $day_arr = explode('-', $last_week_day);
+            $year = $day_arr[0];
+            $month = $day_arr[1];
+            $day = $day_arr[2];
+
+            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[substr($last_week_day, 5)][$name] = $day_count;
+                $data_week['total'][$name] += $day_count;
             }
 
-        return $this->success($data);
+            $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));
+        }
+
+        return $this->success(['data_month' => $data_month, 'data_week' => $data_week]);
     }
 }