|
...
|
...
|
@@ -176,7 +176,7 @@ class MonthCountLogic extends BaseLogic |
|
|
|
$count = new Count();
|
|
|
|
$startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0)));
|
|
|
|
$ensTime = date('Y-m-d',time());
|
|
|
|
$lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']]);
|
|
|
|
$lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
|
|
|
|
$groupedData = [];
|
|
|
|
foreach ($lists as $k=>$v){
|
|
|
|
$month = date('Y-m', strtotime($v['date']));
|
|
...
|
...
|
@@ -184,7 +184,7 @@ class MonthCountLogic extends BaseLogic |
|
|
|
$groupedData[$month] = [];
|
|
|
|
}
|
|
|
|
if(empty($v['country'])){
|
|
|
|
$v['country'] = ['中国'=>0];
|
|
|
|
$v['country'] = [];
|
|
|
|
}
|
|
|
|
$groupedData[$month][] = $v;
|
|
|
|
}
|
...
|
...
|
|