Merge branch 'group_0313'

app/adminapi/lists/works/GroupServiceWorkLists.php

@@ -76,6 +76,14 @@ class GroupServiceWorkLists extends BaseAdminDataLists implements ListsSearchInt
                     break;
             }
         }
+        if(isset($this->params['appointment_time']) && !empty($this->params['appointment_time'][0]) && !empty($this->params['appointment_time'][1])){
+            $time = [strtotime($this->params['appointment_time'][0]), strtotime($this->params['appointment_time'][1])];
+            $where[] = ['appointment_time', 'between', $time];
+        }
+        if(isset($this->params['finished_time']) && !empty($this->params['finished_time'][0]) && !empty($this->params['finished_time'][1])){
+            $time = [strtotime($this->params['finished_time'][0]), strtotime($this->params['finished_time'][1])];
+            $where[] = ['finished_time', 'between', $time];
+        }
         return $where;
     }
     /**