作者 lyh

gx

@@ -30,6 +30,7 @@ class MonthCountLogic extends BaseLogic @@ -30,6 +30,7 @@ class MonthCountLogic extends BaseLogic
30 */ 30 */
31 public function getCountLists($map,$order = 'created_at',$filed = ['*']){ 31 public function getCountLists($map,$order = 'created_at',$filed = ['*']){
32 $map['project_id'] = $this->user['project_id']; 32 $map['project_id'] = $this->user['project_id'];
  33 + $new = $this->currentMonthCount();
33 $lists = $this->model->list($map,$order,$filed,'desc',10); 34 $lists = $this->model->list($map,$order,$filed,'desc',10);
34 if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){ 35 if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
35 foreach ($lists as $k => $v){ 36 foreach ($lists as $k => $v){
@@ -44,10 +45,11 @@ class MonthCountLogic extends BaseLogic @@ -44,10 +45,11 @@ class MonthCountLogic extends BaseLogic
44 } 45 }
45 } 46 }
46 $v['source_country'] = json_encode(array_values($source_country)); 47 $v['source_country'] = json_encode(array_values($source_country));
  48 + $v['month_total'] = $new['month_total'];
47 $lists[$k] = $v; 49 $lists[$k] = $v;
48 } 50 }
49 } 51 }
50 - $lists['new'] = $this->currentMonthCount(); 52 + $lists['new'] = $new;
51 return $this->success($lists); 53 return $this->success($lists);
52 } 54 }
53 55