likang

catch/tag_history/controller/TagHistory.php

@@ -112,19 +112,20 @@ class TagHistory extends CatchController
             $where[] = ['lable', 'in', "000080000001,000080000002,0000F6000003,0000F6000004,0000F6000005"];
         }
 
-        $list = $this->tagHistoryModel->group('mac,lable')->where($where)
+        $list = $this->tagHistoryModel->group('mac,lable')->where('addTime','>',strtotime(date('Y-d-m')))->where($where)
             ->field('mac,lable')->select()->toArray();
-
+       
         foreach ($list as $key => $value) {
             $towwhere=
             [
                 ['mac', '=', $value['mac']],
                 ['lable', '=', $value['lable']]
             ];
-            $value['addTime'] = $this->tagHistoryModel->
-                where($where)->where($towwhere)->max('addTime');
-            $value['ave_rssi']= $this->tagHistoryModel->where($where)->where($towwhere)->avg('rssi');
-            $value['num']=$this->tagHistoryModel->where($where)->where($towwhere)->count();
+
+            $value['addTime'] = $this->tagHistoryModel->where($onewhere)->
+               where($towwhere)->max('addTime');
+            $value['ave_rssi']= $this->tagHistoryModel->where($towwhere)->where($onewhere)->avg('rssi');
+            $value['num']=$this->tagHistoryModel->where($onewhere)->where($towwhere)->count();
             
 
             $wheres = [];