作者 lyh

gx

@@ -81,7 +81,7 @@ class WeekProject extends Command @@ -81,7 +81,7 @@ class WeekProject extends Command
81 $endOfLastWeekFormatted = date('Y-m-d', $endOfLastWeek); 81 $endOfLastWeekFormatted = date('Y-m-d', $endOfLastWeek);
82 $countModel = new Count(); 82 $countModel = new Count();
83 $startOfLastWeekFormattedInfo = $countModel->read(['date'=>$startOfLastWeekFormatted,'project_id'=>$value['id']],['inquiry_num','country']); 83 $startOfLastWeekFormattedInfo = $countModel->read(['date'=>$startOfLastWeekFormatted,'project_id'=>$value['id']],['inquiry_num','country']);
84 - $endOfLastWeekFormattedInfo = $countModel->read(['date'=>$endOfLastWeekFormatted,'project_id'=>$value['id']],['inquiry_num']); 84 + $endOfLastWeekFormattedInfo = $countModel->read(['date'=>$endOfLastWeekFormatted,'project_id'=>$value['id']],['inquiry_num','country']);
85 $data['inquiry_total'] = $endOfLastWeekFormattedInfo['inquiry_num'] ?? 0;//询盘数量 85 $data['inquiry_total'] = $endOfLastWeekFormattedInfo['inquiry_num'] ?? 0;//询盘数量
86 $data['inquiry_country'] = $endOfLastWeekFormattedInfo['country'] ?? json_encode([]); 86 $data['inquiry_country'] = $endOfLastWeekFormattedInfo['country'] ?? json_encode([]);
87 $data['week_inquiry_total'] = ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0); 87 $data['week_inquiry_total'] = ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0);