From 8cff72e230ed45e6e082488102519f8f833999fd Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Nov 2019 17:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Queue.php         | 5 +++--
 app/admin/view/queue/index_search.html | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 414abb2f0..bba9d8880 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -52,8 +52,9 @@ class Queue extends Controller
         }
         $this->title = '系统任务管理';
         $this->iswin = PATH_SEPARATOR === ';';
-        $query = $this->_query($this->table)->dateBetween('create_at,start_at,end_at');
-        $query->like('title,preload')->equal('status')->order('id desc')->page();
+        $query = $this->_query($this->table)->dateBetween('create_at');
+        $query->timeBetween('enter_time,outer_time')->like('title,command');
+        $query->equal('status')->order('id desc')->page();
     }
 
     /**
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html
index c6c5456c0..244c6e598 100644
--- a/app/admin/view/queue/index_search.html
+++ b/app/admin/view/queue/index_search.html
@@ -52,13 +52,13 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">开始时间</label>
             <div class="layui-input-inline">
-                <input data-date-range name="start_at" value="{:input('get.start_at')}" placeholder="请选择开始时间" class="layui-input">
+                <input data-date-range name="enter_time" value="{:input('get.enter_time')}" placeholder="请选择开始时间" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">结束时间</label>
             <div class="layui-input-inline">
-                <input data-date-range name="end_at" value="{:input('get.end_at')}" placeholder="请选择结束时间" class="layui-input">
+                <input data-date-range name="outer_time" value="{:input('get.outer_time')}" placeholder="请选择结束时间" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">