diff --git a/application/admin/controller/statistics/Worker.php b/application/admin/controller/statistics/Worker.php
index 20fb886..081ba98 100644
--- a/application/admin/controller/statistics/Worker.php
+++ b/application/admin/controller/statistics/Worker.php
@@ -12,6 +12,7 @@ use PDOStatement;
 use think\Collection;
 use think\Exception;
 use think\exception\DbException;
+use think\Loader;
 use think\response\Json;
 
 /**
@@ -112,13 +113,31 @@ class Worker extends Backend
             return $this->selectpage();
         }
 
+        $filter = $this->request->param('filter');
+        $filter = json_decode($filter,true);
+        if(!empty($filter['daterange'])){
+            $arr = explode(' - ',$filter['daterange']);
+            if(trim($arr[0])){
+                $filter['start_time'] = trim($arr[0]);
+            }
+            if(trim($arr[1])){
+                $filter['end_time'] = trim($arr[1]);
+            }
+
+            /*unset($filter['daterange']); // 移除 status
+
+            $newFilter = json_encode($filter, JSON_UNESCAPED_UNICODE);
+
+// 重新赋值到 $_GET，影响 $this->request->get("filter") 后面调用
+            $_GET['filter'] = $newFilter;*/
+        }
 
         //派单表
-        $dispatchSubsql = $this->dispatchSubsql();
+        $dispatchSubsql = $this->dispatchSubsql($filter);
         //订单表
-        $orderSubsql = $this->oderSubsql();
+        $orderSubsql = $this->oderSubsql($filter);
         //评分表
-        $viewSubsql = OrderReview::where('worker_star',5)->field(['worker_id','count(*) as good_count'])->group('worker_id')->buildSql();
+        $viewSubsql = $this->viewSubsql($filter);
 
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
         $list = $this->model->alias('fa_worker')
@@ -151,11 +170,28 @@ class Worker extends Backend
     }
 
 
+    /**
+     * @return bool|Collection|PDOStatement|string
+     * @throws DbException
+     */
+    public function viewSubsql($filter=[]){
+        //评分表
+        $viewSubsql = OrderReview::where('worker_star',5)->field(['worker_id','count(*) as good_count']);
+
+        if(!empty($filter['start_time'])){
+            $viewSubsql->where('create_time','>=',$filter['start_time']);
+        }
+        if(!empty($filter['end_time'])){
+            $viewSubsql->where('create_time','<=',$filter['start_time']);
+        }
+        return $viewSubsql->group('worker_id')->buildSql();
+    }
+
     /**
      * @return bool|PDOStatement|string|Collection
      * @throws DbException
      */
-    public function dispatchSubsql(): Collection|bool|string|PDOStatement
+    public function dispatchSubsql($filter): Collection|bool|string|PDOStatement
     {
         $builder = new OrderDispatch();
         $fields = [
@@ -168,6 +204,14 @@ class Worker extends Backend
             "AVG(CASE WHEN status = 60 AND arrive_time IS NOT NULL THEN UNIX_TIMESTAMP(arrive_time) - UNIX_TIMESTAMP(create_time) END) AS avg_time_diff",   //联系时效
         ];
         $builder->field($fields);
+
+        if(!empty($filter['start_time'])){
+            $builder->where('create_time','>=',$filter['start_time']);
+        }
+        if(!empty($filter['end_time'])){
+            $builder->where('create_time','<=',$filter['start_time']);
+        }
+
         $builder->group('worker_id');
         return $builder->buildSql();
     }
@@ -179,8 +223,9 @@ class Worker extends Backend
     /**
      * @throws DbException
      */
-    public function oderSubsql()
+    public function oderSubsql($filter = []): Collection|bool|string|PDOStatement
     {
+
         $orderValid = implode(',',(new Order())->tabStatus(Order::TAB_VALID));
 
         //"COUNT(CASE WHEN status IN (".$orderValid.") THEN 1 END) AS ing_num",
@@ -201,6 +246,14 @@ class Worker extends Backend
         ];
 
         $builder = (new Order())->field($fields);
+
+        if(!empty($filter['start_time'])){
+            $builder->where('create_time','>=',$filter['start_time']);
+        }
+        if(!empty($filter['end_time'])){
+            $builder->where('create_time','<=',$filter['start_time']);
+        }
+
         //->where('dispatch_admin_id','>',0);
         return $builder->group('worker_id')->buildSql();
 
@@ -240,11 +293,196 @@ class Worker extends Backend
             //上门率 = 打卡数 / 接单数
             $datum->arrive_rate = $this->_calc($datum->arrive_count,$datum->get_count,4,true);
             //好评率
-            $datum->arrive_rate = $this->_calc($datum->good_count,$datum->finish_num,4,true);
+            $datum->good_rate = $this->_calc($datum->good_count,$datum->finish_num,4,true);
 
             $datum->avg_time_diff = $this->_calc($datum->avg_time_diff,3600*24,2);
         }
     }
 
 
+    /**
+     * 生成查询所需要的条件,排序方式
+     * @param mixed   $searchfields   快速查询的字段
+     * @param boolean $relationSearch 是否关联查询
+     * @return array
+     */
+    protected function buildparams($searchfields = null, $relationSearch = null)
+    {
+        $searchfields = is_null($searchfields) ? $this->searchFields : $searchfields;
+        $relationSearch = is_null($relationSearch) ? $this->relationSearch : $relationSearch;
+        $search = $this->request->get("search", '');
+        $filter = $this->request->get("filter", '');
+        $op = $this->request->get("op", '', 'trim');
+        $sort = $this->request->get("sort", !empty($this->model) && $this->model->getPk() ? $this->model->getPk() : 'id');
+        $order = $this->request->get("order", "DESC");
+        $offset = max(0, $this->request->get("offset/d", 0));
+        $limit = max(0, $this->request->get("limit/d", 0));
+        $limit = $limit ?: 999999;
+        //新增自动计算页码
+        $page = $limit ? intval($offset / $limit) + 1 : 1;
+        if ($this->request->has("page")) {
+            $page = max(0, $this->request->get("page/d", 1));
+        }
+        $this->request->get([config('paginate.var_page') => $page]);
+        $filter = (array)json_decode($filter, true);
+        unset($filter['daterange']);
+        $op = (array)json_decode($op, true);
+        $filter = $filter ? $filter : [];
+        $where = [];
+        $alias = [];
+        $bind = [];
+        $name = '';
+        $aliasName = '';
+        if (!empty($this->model) && $relationSearch) {
+            $name = $this->model->getTable();
+            $alias[$name] = Loader::parseName(basename(str_replace('\\', '/', get_class($this->model))));
+            $aliasName = $alias[$name] . '.';
+        }
+        $sortArr = explode(',', $sort);
+        foreach ($sortArr as $index => & $item) {
+            $item = stripos($item, ".") === false ? $aliasName . trim($item) : $item;
+        }
+        unset($item);
+        $sort = implode(',', $sortArr);
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            $where[] = [$aliasName . $this->dataLimitField, 'in', $adminIds];
+        }
+        if ($search) {
+            $searcharr = is_array($searchfields) ? $searchfields : explode(',', $searchfields);
+            foreach ($searcharr as $k => &$v) {
+                $v = stripos($v, ".") === false ? $aliasName . $v : $v;
+            }
+            unset($v);
+            $where[] = [implode("|", $searcharr), "LIKE", "%{$search}%"];
+        }
+        $index = 0;
+        foreach ($filter as $k => $v) {
+            if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
+                continue;
+            }
+            $sym = $op[$k] ?? '=';
+            if (stripos($k, ".") === false) {
+                $k = $aliasName . $k;
+            }
+            $v = !is_array($v) ? trim($v) : $v;
+            $sym = strtoupper($op[$k] ?? $sym);
+            //null和空字符串特殊处理
+            if (!is_array($v)) {
+                if (in_array(strtoupper($v), ['NULL', 'NOT NULL'])) {
+                    $sym = strtoupper($v);
+                }
+                if (in_array($v, ['""', "''"])) {
+                    $v = '';
+                    $sym = '=';
+                }
+            }
+
+            switch ($sym) {
+                case '=':
+                case '<>':
+                    $where[] = [$k, $sym, (string)$v];
+                    break;
+                case 'LIKE':
+                case 'NOT LIKE':
+                case 'LIKE %...%':
+                case 'NOT LIKE %...%':
+                    $where[] = [$k, trim(str_replace('%...%', '', $sym)), "%{$v}%"];
+                    break;
+                case '>':
+                case '>=':
+                case '<':
+                case '<=':
+                    $where[] = [$k, $sym, intval($v)];
+                    break;
+                case 'FINDIN':
+                case 'FINDINSET':
+                case 'FIND_IN_SET':
+                    $v = is_array($v) ? $v : explode(',', str_replace(' ', ',', $v));
+                    $findArr = array_values($v);
+                    foreach ($findArr as $idx => $item) {
+                        $bindName = "item_" . $index . "_" . $idx;
+                        $bind[$bindName] = $item;
+                        $where[] = "FIND_IN_SET(:{$bindName}, `" . str_replace('.', '`.`', $k) . "`)";
+                    }
+                    break;
+                case 'IN':
+                case 'IN(...)':
+                case 'NOT IN':
+                case 'NOT IN(...)':
+                    $where[] = [$k, str_replace('(...)', '', $sym), is_array($v) ? $v : explode(',', $v)];
+                    break;
+                case 'BETWEEN':
+                case 'NOT BETWEEN':
+                    $arr = array_slice(explode(',', $v), 0, 2);
+                    if (stripos($v, ',') === false || !array_filter($arr, function ($v) {
+                            return $v != '' && $v !== false && $v !== null;
+                        })) {
+                        continue 2;
+                    }
+                    //当出现一边为空时改变操作符
+                    if ($arr[0] === '') {
+                        $sym = $sym == 'BETWEEN' ? '<=' : '>';
+                        $arr = $arr[1];
+                    } elseif ($arr[1] === '') {
+                        $sym = $sym == 'BETWEEN' ? '>=' : '<';
+                        $arr = $arr[0];
+                    }
+                    $where[] = [$k, $sym, $arr];
+                    break;
+                case 'RANGE':
+                case 'NOT RANGE':
+                    $v = str_replace(' - ', ',', $v);
+                    $arr = array_slice(explode(',', $v), 0, 2);
+                    if (stripos($v, ',') === false || !array_filter($arr)) {
+                        continue 2;
+                    }
+                    //当出现一边为空时改变操作符
+                    if ($arr[0] === '') {
+                        $sym = $sym == 'RANGE' ? '<=' : '>';
+                        $arr = $arr[1];
+                    } elseif ($arr[1] === '') {
+                        $sym = $sym == 'RANGE' ? '>=' : '<';
+                        $arr = $arr[0];
+                    }
+                    $tableArr = explode('.', $k);
+                    if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias)
+                        && !empty($this->model) && $this->relationSearch) {
+                        //修复关联模型下时间无法搜索的BUG
+                        $relation = Loader::parseName($tableArr[0], 1, false);
+                        $alias[$this->model->$relation()->getTable()] = $tableArr[0];
+                    }
+                    $where[] = [$k, str_replace('RANGE', 'BETWEEN', $sym) . ' TIME', $arr];
+                    break;
+                case 'NULL':
+                case 'IS NULL':
+                case 'NOT NULL':
+                case 'IS NOT NULL':
+                    $where[] = [$k, strtolower(str_replace('IS ', '', $sym))];
+                    break;
+                default:
+                    break;
+            }
+            $index++;
+        }
+        if (!empty($this->model)) {
+            $this->model->alias($alias);
+        }
+        $model = $this->model;
+        $where = function ($query) use ($where, $alias, $bind, &$model) {
+            if (!empty($model)) {
+                $model->alias($alias);
+                $model->bind($bind);
+            }
+            foreach ($where as $k => $v) {
+                if (is_array($v)) {
+                    call_user_func_array([$query, 'where'], $v);
+                } else {
+                    $query->where($v);
+                }
+            }
+        };
+        return [$where, $sort, $order, $offset, $limit, $page, $alias, $bind];
+    }
+
 }