周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 eae3f8363cfeed5b080a7cab7068c3332bad5328 2 个父辈 860e7c9d f75b275a

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -78,7 +78,7 @@ class WeekProject extends Command @@ -78,7 +78,7 @@ class WeekProject extends Command
78 $data['inquiry_country'] = $yesCountInfo['country'] ?? json_encode([]); 78 $data['inquiry_country'] = $yesCountInfo['country'] ?? json_encode([]);
79 $lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天 79 $lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天
80 //本周 80 //本周
81 - $lastDayOfLastWeekInfo = $countModel->read(['date'=>$yesterday,'project_id'=>$value['id']],['inquiry_num']); 81 + $lastDayOfLastWeekInfo = $countModel->read(['date'=>$lastDayOfLastWeek,'project_id'=>$value['id']],['inquiry_num']);
82 $data['week_inquiry_total'] = ($yesCountInfo['inquiry_num'] ?? 0) - ($lastDayOfLastWeekInfo['inquiry_num'] ?? 0); 82 $data['week_inquiry_total'] = ($yesCountInfo['inquiry_num'] ?? 0) - ($lastDayOfLastWeekInfo['inquiry_num'] ?? 0);
83 $rankDataModel = new RankData(); 83 $rankDataModel = new RankData();
84 $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']); 84 $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']);