From 3e4a832d60a2abb4b7434956cb5dba4da42261f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 15 Aug 2019 22:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/log.html                 | 43 ++++++++++---------
 src/main/resources/mapper_xml/LogMapperEx.xml |  4 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/erp_web/pages/manage/log.html b/erp_web/pages/manage/log.html
index 0b4d4c87..e69f18a3 100644
--- a/erp_web/pages/manage/log.html
+++ b/erp_web/pages/manage/log.html
@@ -25,13 +25,17 @@
                 <input type="text" name="searchOperation" id="searchOperation" style="width:90px;"/>
             </td>
 
-            <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>操作人员：</td>
             <td>
                 <select name="searchUsernameID" id="searchUsernameID" style="width:90px;"/>
             </td>
             <td>&nbsp;</td>
+            <td>开始时间：</td>
+            <td>
+                <input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datetimebox"
+                       style="width:135px;"/>
+            </td>
             <td>&nbsp;</td>
             <td>操作IP：</td>
             <td>
@@ -39,6 +43,14 @@
             </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
+            <td>&nbsp;</td>
+        </tr>
+        <tr>
+            <td>操作详情：</td>
+            <td>
+                <input type="text" name="searchDesc" id="searchDesc" style="width:90px;"/>
+            </td>
+            <td>&nbsp;</td>
             <td>操作状态：</td>
             <td>
                 <select name="searchStatus" id="searchStatus" style="width:90px;">
@@ -47,30 +59,19 @@
                     <option value="1">失败</option>
                 </select>
             </td>
-        </tr>
-        <tr>
-            <td>开始时间：</td>
-            <td>
-                <input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datebox"
-                       style="width:90px;"/>
-            </td>
-            <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>结束时间：</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datebox" style="width:90px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>操作详情：</td>
-            <td>
-                <input type="text" name="searchDesc" id="searchDesc" style="width:90px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datetimebox"
+                       style="width:135px;"/>
             </td>
             <td>&nbsp;</td>
             <td colspan="3">
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
             </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
         </tr>
     </table>
 </div>
@@ -118,13 +119,13 @@
             pageList: initPageNum,
             columns: [[
                 {title: '操作模块', field: 'operation', width: 120},
-                {title: '操作人员', field: 'username', width: 80, align: "center"},
-                {title: '操作IP', field: 'clientip', width: 90, align: "center"},
-                {title: '操作时间', field: 'createTimeStr', width: 130, align: "center"},
                 {title: '操作详情', field: 'remark', width: 350},
-                {title: '操作状态',field: 'status',width:70,align:"center",formatter:function(value){
+                {title: '操作人员', field: 'username', width: 100, align: "center"},
+                {title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){
                     return value? "失败":"成功";
-                }}
+                }},
+                {title: '操作IP', field: 'clientip', width: 100, align: "center"},
+                {title: '操作时间', field: 'createTimeStr', width: 150, align: "center"}
             ]],
             onLoadError: function () {
                 $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
diff --git a/src/main/resources/mapper_xml/LogMapperEx.xml b/src/main/resources/mapper_xml/LogMapperEx.xml
index afb489f1..968edbf4 100644
--- a/src/main/resources/mapper_xml/LogMapperEx.xml
+++ b/src/main/resources/mapper_xml/LogMapperEx.xml
@@ -23,10 +23,10 @@
             and l.status=${status}
         </if>
         <if test="beginTime != null">
-            and l.createtime &gt;= '%${beginTime}%'
+            and l.createtime &gt;= '${beginTime}'
         </if>
         <if test="endTime != null">
-            and l.createtime &lt;= '%${endTime}%'
+            and l.createtime &lt;= '${endTime}'
         </if>
         <if test="contentdetails != null">
             and l.contentdetails like '%${contentdetails}%'