From 3faa1361b113fc2304d518c75e2d8eba02a84bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Fri, 17 Sep 2021 09:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=20=E4=BF=AE=E6=94=B9=20=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/baselocationinfo/baselocationinfo.html    |  4 ++--
 .../resources/templates/system/recorderror/add.html  |  2 +-
 .../resources/templates/system/recorderror/edit.html |  2 +-
 .../templates/system/recorderror/recorderror.html    | 12 ++++++------
 .../resources/templates/system/recordtask/add.html   |  2 +-
 .../resources/templates/system/recordtask/edit.html  |  2 +-
 .../templates/system/recordtask/recordtask.html      | 11 ++++++++---
 .../com/ruoyi/system/domain/BaseEfficiencyLevel.java |  2 +-
 .../com/ruoyi/system/domain/BaseLocationInfo.java    |  2 +-
 .../com/ruoyi/system/domain/BaseMaterialInfo.java    |  2 +-
 .../com/ruoyi/system/domain/BaseMaterialStore.java   |  2 +-
 .../java/com/ruoyi/system/domain/BasePlcInfo.java    |  2 +-
 .../java/com/ruoyi/system/domain/BaseStoreInfo.java  |  2 +-
 .../com/ruoyi/system/domain/PrepareInstoreInfo.java  |  6 +++---
 .../com/ruoyi/system/domain/PrepareOutstoreInfo.java |  6 +++---
 .../system/domain/RecordDirectiveOperation.java      |  2 +-
 .../java/com/ruoyi/system/domain/RecordError.java    |  6 +++---
 .../java/com/ruoyi/system/domain/RecordInstore.java  |  2 +-
 .../java/com/ruoyi/system/domain/RecordOutstore.java |  6 +++---
 .../java/com/ruoyi/system/domain/RecordTask.java     |  6 +++---
 20 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
index 90acf7c..3816f26 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
@@ -147,7 +147,6 @@
                     field: 'efficiency',
                     title: '效率级别',
                     formatter: function(value, row, index) {
-                        console.log(efficiencyDatas)
                         return $.table.selectDictLabelLocation(efficiencyDatas, value);
                     }
 
@@ -158,7 +157,8 @@
                 },
                 {
                     field: 'recordTime',
-                    title: '记录时间'
+                    title: '记录时间',
+                    sortable: true
                 },
                 {
                     title: '操作',
diff --git a/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html b/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
index 3ae1233..eb40f74 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
@@ -64,7 +64,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">任务状态：</label>
                 <div class="col-sm-8">
-                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html b/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
index 91dc4b2..46e7caf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
@@ -65,7 +65,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">任务状态：</label>
                 <div class="col-sm-8">
-                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taskStatus}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html b/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
index b9029d1..1ee39e5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
@@ -18,7 +18,7 @@
                                 <label>箱体编码：</label>
                                 <input type="text" name="boxCode"/>
                             </li>
-                            <li>
+                           <!-- <li>
                                 <label>门体/物料编码：</label>
                                 <input type="text" name="materialCode"/>
                             </li>
@@ -41,19 +41,19 @@
                             <li>
                                 <label>操作类型：</label>
                                 <input type="text" name="operationType"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <label>任务类型：</label>
                                 <input type="text" name="taskType"/>
                             </li>
                             <li>
                                 <label>任务状态：</label>
-                                <select name="taskStatus" th:with="type=${@dict.getType('location_status')}">
+                                <select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li>
+                           <!-- <li>
                                 <label>返回标识：</label>
                                 <input type="text" name="returnFlag"/>
                             </li>
@@ -68,7 +68,7 @@
                             <li>
                                 <label>记录时间：</label>
                                 <input type="text" class="time-input" placeholder="请选择记录时间" name="recordTime"/>
-                            </li>
+                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -101,7 +101,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:recorderror:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:recorderror:remove')}]];
-        var taskStatusDatas = [[${@dict.getType('location_status')}]];
+        var taskStatusDatas = [[${@dict.getType('task_status')}]];
         var prefix = ctx + "system/recorderror";
 
         $(function() {
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
index e53f7f2..4b0d047 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
@@ -65,7 +65,7 @@
                 <label class="col-sm-3 control-label">任务状态：</label>
 
                 <div class="col-sm-8">
-                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
index 3fa3cf0..e8be018 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
@@ -66,7 +66,7 @@
                 <label class="col-sm-3 control-label">任务状态：</label>
 
                 <div class="col-sm-8">
-                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationStatus}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
index 01a6768..ad70232 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
@@ -20,7 +20,7 @@
                             </li>
                             <li>
                                 <label>任务状态：</label>
-                                <select name="taskStatus" th:with="type=${@dict.getType('location_status')}">
+                                <select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -58,6 +58,8 @@
         var editFlag = [[${@permission.hasPermi('system:recordtask:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:recordtask:remove')}]];
 
+        var taskstatus = [[${@dict.getType('task_status')}]];
+        var tasktype = [[${@dict.getType('task_type')}]];
 
         var locationStatus = [[${@dict.getType('location_status')}]];
 
@@ -113,13 +115,16 @@
                 },
                 {
                     field: 'taskType',
-                    title: '任务类型'
+                    title: '任务类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(tasktype, value);
+                    }
                 },
                 {
                     field: 'taskStatus',
                     title: '任务状态',
                     formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(locationStatus, value);
+                        return $.table.selectDictLabel(taskstatus, value);
                     }
                 },
                 {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
index cdf3c01..3f78f53 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
@@ -36,7 +36,7 @@ public class BaseEfficiencyLevel extends BaseEntity
     private Long deleteFlag;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java
index b27e7e5..e2b5df5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java
@@ -64,7 +64,7 @@ public class BaseLocationInfo extends BaseEntity
     private Long deleteFlag;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java
index 863d64a..dd176b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java
@@ -48,7 +48,7 @@ public class BaseMaterialInfo extends BaseEntity
     private Long deleteFlag;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
index 502a709..fc76a9f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
@@ -44,7 +44,7 @@ public class BaseMaterialStore extends BaseEntity
     private Long deleteFlag;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePlcInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePlcInfo.java
index a3a7a06..4e2946d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePlcInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePlcInfo.java
@@ -52,7 +52,7 @@ public class BasePlcInfo extends BaseEntity
     private Long deleteFlag;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
index 1c0d147..8bad346 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
@@ -48,7 +48,7 @@ public class BaseStoreInfo extends BaseEntity
     private Long deleteFlag;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareInstoreInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareInstoreInfo.java
index 34644fc..b920eed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareInstoreInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareInstoreInfo.java
@@ -53,17 +53,17 @@ public class PrepareInstoreInfo extends BaseEntity
     private Long instoreStatus;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareOutstoreInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareOutstoreInfo.java
index c8f9dfd..d704077 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareOutstoreInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareOutstoreInfo.java
@@ -57,17 +57,17 @@ public class PrepareOutstoreInfo extends BaseEntity
     private Long outstoreStauts;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordDirectiveOperation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordDirectiveOperation.java
index 0d94021..b4e4a1d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordDirectiveOperation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordDirectiveOperation.java
@@ -53,7 +53,7 @@ public class RecordDirectiveOperation extends BaseEntity
     private String taskType;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
index 22b928d..9b533cc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
@@ -65,17 +65,17 @@ public class RecordError extends BaseEntity
     private String returnFlag;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
index 60189c9..cdd515b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
@@ -53,7 +53,7 @@ public class RecordInstore extends BaseEntity
     private String endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordOutstore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordOutstore.java
index fcef0d9..9a06372 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordOutstore.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordOutstore.java
@@ -49,17 +49,17 @@ public class RecordOutstore extends BaseEntity
     private Long outstoreStatus;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTask.java
index 1c866c7..3e5e796 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTask.java
@@ -65,17 +65,17 @@ public class RecordTask extends BaseEntity
     private String returnFlag;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;