作者 lyh

gx

@@ -62,7 +62,6 @@ class MonthCountLogic extends BaseLogic @@ -62,7 +62,6 @@ class MonthCountLogic extends BaseLogic
62 $startTime = Carbon::now()->startOfMonth()->toDateString(); 62 $startTime = Carbon::now()->startOfMonth()->toDateString();
63 $endTime = date('Y-m-d',time()); 63 $endTime = date('Y-m-d',time());
64 $arr = []; 64 $arr = [];
65 - ProjectServer::useProject($this->user['project_id']);  
66 $arr = $this->inquiryCount($arr,$startTime,$endTime,$this->user['domain']); 65 $arr = $this->inquiryCount($arr,$startTime,$endTime,$this->user['domain']);
67 $arr = $this->flowCount($arr,$startTime,$endTime,$this->user['project_id']); 66 $arr = $this->flowCount($arr,$startTime,$endTime,$this->user['project_id']);
68 $arr = $this->sourceCount($arr,$startTime,$endTime,$this->user['domain']); 67 $arr = $this->sourceCount($arr,$startTime,$endTime,$this->user['domain']);
@@ -91,7 +90,6 @@ class MonthCountLogic extends BaseLogic @@ -91,7 +90,6 @@ class MonthCountLogic extends BaseLogic
91 foreach ($data as $v){ 90 foreach ($data as $v){
92 if(($startTime.' 00:00:00' <= $v['submit_time']) && $v['submit_time'] <= $endTime.' 23:59:59'){ 91 if(($startTime.' 00:00:00' <= $v['submit_time']) && $v['submit_time'] <= $endTime.' 23:59:59'){
93 $arr['month_total']++; 92 $arr['month_total']++;
94 - }  
95 if(isset($countryArr[$v['country']])){ 93 if(isset($countryArr[$v['country']])){
96 $countryArr[$v['country']]++; 94 $countryArr[$v['country']]++;
97 }else{ 95 }else{
@@ -100,6 +98,7 @@ class MonthCountLogic extends BaseLogic @@ -100,6 +98,7 @@ class MonthCountLogic extends BaseLogic
100 } 98 }
101 } 99 }
102 } 100 }
  101 + }
103 //加上其他询盘 102 //加上其他询盘
104 $arr['total'] += InquiryFormData::getCount(); 103 $arr['total'] += InquiryFormData::getCount();
105 $arr['month_total'] += InquiryFormData::getCount([$startTime, $endTime]); 104 $arr['month_total'] += InquiryFormData::getCount([$startTime, $endTime]);