周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 50ca292d9cda16d80ec9a53be3e87912658c47e0 1 个父辈 0e29cbba

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 5 行增加 和 5 行删除
@@ -56,7 +56,7 @@ class LastInquiry extends Command @@ -56,7 +56,7 @@ class LastInquiry extends Command
56 $last_time = $res['data']['data'][0] ?? ''; 56 $last_time = $res['data']['data'][0] ?? '';
57 //其他询盘的最新时间 57 //其他询盘的最新时间
58 ProjectServer::useProject($item['id']); 58 ProjectServer::useProject($item['id']);
59 - $other_last_time = InquiryFormData::orderBy('id', 'desc')->value('submit_time'); 59 + $other_last_time = InquiryFormData::orderBy('id', 'desc')->value('submit_at');
60 60
61 $last_inquiry_time = $last_time > $other_last_time ? $last_time : $other_last_time; 61 $last_inquiry_time = $last_time > $other_last_time ? $last_time : $other_last_time;
62 62
@@ -108,8 +108,8 @@ class InquiryMonthlyCount extends Command @@ -108,8 +108,8 @@ class InquiryMonthlyCount extends Command
108 //加上其他询盘 108 //加上其他询盘
109 ProjectServer::useProject($project_id); 109 ProjectServer::useProject($project_id);
110 $arr['total'] += InquiryFormData::count(); 110 $arr['total'] += InquiryFormData::count();
111 - $arr['month_total'] += InquiryFormData::whereBetween('submit_time',[$startTime, $endTime])->count();  
112 - $countryData = InquiryFormData::whereBetween('submit_time',[$startTime, $endTime]) 111 + $arr['month_total'] += InquiryFormData::whereBetween('submit_at',[$startTime, $endTime])->count();
  112 + $countryData = InquiryFormData::whereBetween('submit_at',[$startTime, $endTime])
113 ->select("country",DB::raw('COUNT(*) as count')) 113 ->select("country",DB::raw('COUNT(*) as count'))
114 ->groupBy('country')->get()->toArray(); 114 ->groupBy('country')->get()->toArray();
115 foreach ($countryData as $v1){ 115 foreach ($countryData as $v1){
@@ -87,8 +87,8 @@ class MonthCountLogic extends BaseLogic @@ -87,8 +87,8 @@ class MonthCountLogic extends BaseLogic
87 } 87 }
88 //加上其他询盘 88 //加上其他询盘
89 $arr['total'] += InquiryFormData::count(); 89 $arr['total'] += InquiryFormData::count();
90 - $arr['month_total'] += InquiryFormData::whereBetween('submit_time',[$startTime, $endTime])->count();  
91 - $countryData = InquiryFormData::whereBetween('submit_time',[$startTime, $endTime]) 90 + $arr['month_total'] += InquiryFormData::whereBetween('submit_at',[$startTime, $endTime])->count();
  91 + $countryData = InquiryFormData::whereBetween('submit_at',[$startTime, $endTime])
92 ->select("country",DB::raw('COUNT(*) as count')) 92 ->select("country",DB::raw('COUNT(*) as count'))
93 ->groupBy('country')->get()->toArray(); 93 ->groupBy('country')->get()->toArray();
94 foreach ($countryData as $v1){ 94 foreach ($countryData as $v1){