合并分支 'master-server' 到 'master'

gx统计数据



查看合并请求 !928

@@ -73,12 +73,12 @@ class WeekProject extends Command
         ];
         ];
         $yesterday = Carbon::yesterday()->toDateString();//昨天
         $yesterday = Carbon::yesterday()->toDateString();//昨天
         $countModel = new Count();
         $countModel = new Count();
-        $yesCountInfo = $countModel->read(['project_id'=>$yesterday],['inquiry_num','country']);
+        $yesCountInfo = $countModel->read(['date'=>$yesterday,'project_id'=>$value['id']],['inquiry_num','country']);
         $data['inquiry_total'] = $yesCountInfo['inquiry_num'] ?? 0;//询盘数量
         $data['inquiry_total'] = $yesCountInfo['inquiry_num'] ?? 0;//询盘数量
         $data['inquiry_country'] = $yesCountInfo['country'];
         $data['inquiry_country'] = $yesCountInfo['country'];
         $lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天
         $lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天
         //本周
         //本周
-        $lastDayOfLastWeekInfo = $countModel->read(['project_id'=>$lastDayOfLastWeek],['inquiry_num']);
+        $lastDayOfLastWeekInfo = $countModel->read(['date'=>$yesterday,'project_id'=>$value['id']],['inquiry_num']);
         $data['week_inquiry_total'] = ($yesCountInfo['inquiry_num'] ?? 0) - ($lastDayOfLastWeekInfo['inquiry_num'] ?? 0);
         $data['week_inquiry_total'] = ($yesCountInfo['inquiry_num'] ?? 0) - ($lastDayOfLastWeekInfo['inquiry_num'] ?? 0);
         $rankDataModel = new RankData();
         $rankDataModel = new RankData();
         $rankInfo = $rankDataModel->read(['project_id'=>$value['id']],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
         $rankInfo = $rankDataModel->read(['project_id'=>$value['id']],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);