likang

catch/tag_history/controller/TagHistory.php

@@ -128,11 +128,11 @@ class TagHistory extends CatchController
             
             $list[$key]['addTime'] = $value['addTime'];
             
-            $value['ave_rssi']= $this->tagHistoryModel->where($towwhere)->avg('rssi');
+            $value['ave_rssi']= $this->tagHistoryModel->where($towwhere)->where($onewhere)->avg('rssi');
             $list[$key]['ave_rssi'] =  $value['ave_rssi'];
             
 
-            $value['num']=$this->tagHistoryModel->where($onewhere)->where($towwhere)->count();
+            $value['num']=$this->tagHistoryModel->where($towwhere)->count();
             $list[$key]['num'] = $value['num'];
             $wheres = [];
             $wh = [];