From fa1c15e8b189b759fff38fc3341fcc6d52d5fa15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 12 Jun 2019 22:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=B6=E6=94=AF=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A0=E6=B3=95=E6=8C=89=E6=97=B6=E9=97=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/financial/financial_base.js         | 12 ++++++++++--
 .../resources/mapper_xml/AccountHeadMapperEx.xml     |  8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/erp_web/js/pages/financial/financial_base.js b/erp_web/js/pages/financial/financial_base.js
index 54645980..65a3864b 100644
--- a/erp_web/js/pages/financial/financial_base.js
+++ b/erp_web/js/pages/financial/financial_base.js
@@ -959,6 +959,14 @@
 	}			
 				
 	function showAccountHeadDetails(pageNo,pageSize){
+        var beginTime = $.trim($("#searchBeginTime").val());
+        var endTime = $.trim($("#searchEndTime").val());
+        if(beginTime) {
+            beginTime = beginTime + ' 00:00:00';
+        }
+        if(endTime) {
+            endTime = endTime + ' 23:59:59';
+        }
 		$.ajax({
 			type:"get",
 			url: "/accountHead/list",
@@ -967,8 +975,8 @@
                 search: JSON.stringify({
                     type: listType,
                     billNo: $.trim($("#searchBillNo").val()),
-                    beginTime: $("#searchBeginTime").val(),
-                    endTime: $("#searchEndTime").val()
+                    beginTime: beginTime,
+                    endTime: endTime
                 }),
                 currentPage: pageNo,
                 pageSize: pageSize
diff --git a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
index d5f894b0..f1ab4536 100644
--- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
@@ -22,10 +22,10 @@
             and ah.Type='${type}'
         </if>
         <if test="beginTime != null">
-            and ah.BillTime &gt;= '%${beginTime}%'
+            and ah.BillTime &gt;= '${beginTime}'
         </if>
         <if test="endTime != null">
-            and ah.BillTime &lt;= '%${endTime}%'
+            and ah.BillTime &lt;= '${endTime}'
         </if>
         and ifnull(ah.delete_Flag,'0') !='1'
         order by ah.Id desc
@@ -47,10 +47,10 @@
             and Type='${type}'
         </if>
         <if test="beginTime != null">
-            and BillTime &gt;= '%${beginTime}%'
+            and BillTime &gt;= '${beginTime}'
         </if>
         <if test="endTime != null">
-            and BillTime &lt;= '%${endTime}%'
+            and BillTime &lt;= '${endTime}'
         </if>
         and ifnull(delete_Flag,'0') !='1'
     </select>