From 33e345e056866fb339bbd4319124000d785f9cb1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 21 Aug 2019 15:20:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Queue.php         | 2 +-
 application/admin/view/queue/index_search.html | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/Queue.php b/application/admin/controller/Queue.php
index d93cfe6c5..c6fe7af5a 100644
--- a/application/admin/controller/Queue.php
+++ b/application/admin/controller/Queue.php
@@ -52,7 +52,7 @@ class Queue extends Controller
         }
         $this->title = '系统任务管理';
         $this->iswin = PATH_SEPARATOR === ';';
-        $query = $this->_query($this->table)->dateBetween('create_at,end_at');
+        $query = $this->_query($this->table)->dateBetween('create_at,start_at,end_at');
         $query->like('title,preload')->equal('status')->order('id desc')->page();
     }
 
diff --git a/application/admin/view/queue/index_search.html b/application/admin/view/queue/index_search.html
index 46b2dba0f..e6cc28262 100644
--- a/application/admin/view/queue/index_search.html
+++ b/application/admin/view/queue/index_search.html
@@ -44,6 +44,12 @@
                 <input data-date-range name="create_at" value="{$Think.get.create_at|default=''}" 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="start_at" value="{$Think.get.start_at|default=''}" placeholder="请选择开始时间" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">跟进时间</label>
             <div class="layui-input-inline">