合并分支 'akun' 到 'master'

Akun



查看合并请求 !3110

@@ -528,14 +528,15 @@ class InquiryForwardLogic extends BaseLogic
     {
         $data = Cache::get('inquiry_manage_count');
         if (!$data) {
-            $manage_ids = ForwardCount::select('manage_id')->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray();
             $manageModel = new Manage();
 
             //月统计
+            $last_year_month = date('Y-m', strtotime('-11 months'));
+            $manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_year_month . '-02')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray();
+
             $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) {
                 $month_arr = explode('-', $last_year_month);
                 $year = $month_arr[0];
@@ -554,10 +555,12 @@ class InquiryForwardLogic extends BaseLogic
 
 
             //周统计
+            $last_week_day = date('Y-m-d', strtotime('-1 week'));
+            $manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_week_day . ' +1 day')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray();
+
             $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) {
                 $day_arr = explode('-', $last_week_day);
                 $year = $day_arr[0];