正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -25,7 +25,7 @@ class MonthCountLogic extends BaseLogic | @@ -25,7 +25,7 @@ class MonthCountLogic extends BaseLogic | ||
| 25 | */ | 25 | */ |
| 26 | public function getCountLists($map,$order = 'created_at',$filed = ['*']){ | 26 | public function getCountLists($map,$order = 'created_at',$filed = ['*']){ |
| 27 | $map['project_id'] = $this->user['project_id']; | 27 | $map['project_id'] = $this->user['project_id']; |
| 28 | - $lists = $this->model->list($map,$order,$filed,'desc',36); | 28 | + $lists = $this->model->list($map,$order,$filed,'desc'); |
| 29 | if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){ | 29 | if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){ |
| 30 | foreach ($lists as $k => $v){ | 30 | foreach ($lists as $k => $v){ |
| 31 | if(empty($v['source_country'])){ | 31 | if(empty($v['source_country'])){ |
| @@ -57,7 +57,7 @@ class MonthCountLogic extends BaseLogic | @@ -57,7 +57,7 @@ class MonthCountLogic extends BaseLogic | ||
| 57 | $count = new Count(); | 57 | $count = new Count(); |
| 58 | $startTime = date("Y-m-d", strtotime("-35 months", mktime(0, 0, 0))); | 58 | $startTime = date("Y-m-d", strtotime("-35 months", mktime(0, 0, 0))); |
| 59 | $ensTime = date('Y-m-d',time()); | 59 | $ensTime = date('Y-m-d',time()); |
| 60 | - $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc'); | 60 | + $lists = $count->list(['date'=>['<=',$ensTime],'project_id'=>$this->user['project_id']],'id',['*'],'asc'); |
| 61 | $groupedData = []; | 61 | $groupedData = []; |
| 62 | foreach ($lists as $v){ | 62 | foreach ($lists as $v){ |
| 63 | $month = date('Y-m', strtotime($v['date'])); | 63 | $month = date('Y-m', strtotime($v['date'])); |
-
请 注册 或 登录 后发表评论