周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 19761ad3eadf82950b745552c976ad7ec7b4682c 2 个父辈 54ce8f28 6eb83e8c

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

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -75,7 +75,7 @@ class WeekProject extends Command @@ -75,7 +75,7 @@ class WeekProject extends Command
75 $countModel = new Count(); 75 $countModel = new Count();
76 $yesCountInfo = $countModel->read(['date'=>$yesterday,'project_id'=>$value['id']],['inquiry_num','country']); 76 $yesCountInfo = $countModel->read(['date'=>$yesterday,'project_id'=>$value['id']],['inquiry_num','country']);
77 $data['inquiry_total'] = $yesCountInfo['inquiry_num'] ?? 0;//询盘数量 77 $data['inquiry_total'] = $yesCountInfo['inquiry_num'] ?? 0;//询盘数量
78 - $data['inquiry_country'] = $yesCountInfo['country'] ?? []; 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'=>$yesterday,'project_id'=>$value['id']],['inquiry_num']);