Browse Source

update orderlist wheretime

ayHaru 4 years ago
parent
commit
2976430ae6
2 changed files with 3 additions and 3 deletions
  1. 1 1
      application/index/controller/Order.php
  2. 2 2
      application/index/model/OrderModel.php

+ 1 - 1
application/index/controller/Order.php

@@ -216,7 +216,7 @@ class Order extends Base
             $cabinet = $CabinetModel->find($vo['cabinet_number']);
             $selectResult[$key]['alias'] = $cabinet['alias'];
         }
-        $return['total'] = $OrderModel->getAllCounts($where);  //总数量
+        $return['total'] = $OrderModel->getAllCounts($where,$TimeWhere);  //总数量
         $return['rows'] = $selectResult;
         json_success($return);
     }

+ 2 - 2
application/index/model/OrderModel.php

@@ -101,8 +101,8 @@ class OrderModel extends Model{
     /**
      * 根据搜索条件获取所有的箱子数量
      */
-    public function getAllCounts($where)
+    public function getAllCounts($where,$TimeWhere)
     {
-        return $this->where($where)->count();
+        return $this->where($where)->where($TimeWhere)->count();
     }
 }