作者 刘锟

Merge remote-tracking branch 'origin/master' into akun

... ... @@ -78,7 +78,7 @@ class WeekProject extends Command
$data['inquiry_country'] = $yesCountInfo['country'] ?? json_encode([]);
$lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天
//本周
$lastDayOfLastWeekInfo = $countModel->read(['date'=>$yesterday,'project_id'=>$value['id']],['inquiry_num']);
$lastDayOfLastWeekInfo = $countModel->read(['date'=>$lastDayOfLastWeek,'project_id'=>$value['id']],['inquiry_num']);
$data['week_inquiry_total'] = ($yesCountInfo['inquiry_num'] ?? 0) - ($lastDayOfLastWeekInfo['inquiry_num'] ?? 0);
$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']);
... ...