作者 李宇航

合并分支 'master-server' 到 'master'

gx



查看合并请求 !821
@@ -135,11 +135,11 @@ class MonthProjectCount extends Command @@ -135,11 +135,11 @@ class MonthProjectCount extends Command
135 */ 135 */
136 public function pv_ip(&$arr,$start,$end,$project_id){ 136 public function pv_ip(&$arr,$start,$end,$project_id){
137 $arr['pv'] = (new VisitItem())->where(['project_id'=>$project_id]) 137 $arr['pv'] = (new VisitItem())->where(['project_id'=>$project_id])
138 - ->where('date','>=',$start.' 00:00:00')  
139 - ->where('date','<=',$end.' 23:59:59')->count(); 138 + ->where('updated_date','>=',$start.' 00:00:00')
  139 + ->where('updated_date','<=',$end.' 23:59:59')->count();
140 $arr['ip'] = (new Visit())->where(['project_id'=>$project_id]) 140 $arr['ip'] = (new Visit())->where(['project_id'=>$project_id])
141 - ->where('date','>=',$start.' 00:00:00')  
142 - ->where('date','<=',$end.' 23:59:59')->count(); 141 + ->where('updated_date','>=',$start.' 00:00:00')
  142 + ->where('updated_date','<=',$end.' 23:59:59')->count();
143 if($arr['ip'] != 0){ 143 if($arr['ip'] != 0){
144 $arr['rate'] = round(($arr['month_total'] / $arr['ip']) * 10,2); 144 $arr['rate'] = round(($arr['month_total'] / $arr['ip']) * 10,2);
145 } 145 }