From c60e42d2ba843dfffe6eb0b13027f3e1bbd816ed Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Tue, 18 Sep 2018 18:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=93=E9=A1=B9=E3=80=81?=
 =?UTF-8?q?=E6=9D=A5=E5=87=BD=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E4=BB=85?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=BB=88=E6=AD=A2=E6=97=B6=E9=97=B4=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/RequestInfoDao.xml | 16 +++++++++++-----
 .../nis/web/dao/configuration/TaskInfoDao.xml    | 14 ++++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index 6d9a86251..c08b6396b 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -69,11 +69,17 @@
 		<if test="isValid == null">
 	    		AND r.IS_VALID != -1
 	    	</if>
-		<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND r.request_time between #{beginDate} and #{endDate}
-			</if>
-		<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-				AND r.edit_time between #{dobeginDate} and #{doendDate}
+		<if test="beginDate!=null and beginDate!=''">
+				AND r.request_time &gt;= #{beginDate} 
+		</if>
+		<if test="endDate!=null and endDate!=''">
+				AND r.request_time &lt;=  #{endDate}
+		</if>
+		<if test="dobeginDate!=null and dobeginDate!='' ">
+				AND r.edit_time &gt;= #{dobeginDate}
+		</if>
+		<if test="doendDate!=null and doendDate!=''">
+				AND r.edit_time &lt;=  #{doendDate}
 		</if>
 		<!-- 数据范围过滤 -->
 				${sqlMap.dsf}
diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
index 71df9a380..68116e88d 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -65,11 +65,17 @@
 		<if test="isAudit != null">
 				AND r.is_audit=${isAudit}
 		</if>
-		<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND r.task_time between #{beginDate} and #{endDate}
+		<if test="beginDate!=null and beginDate!='' ">
+				AND r.task_time &gt;= #{beginDate} 
 	 	</if>
-		<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-				AND r.edit_time between #{dobeginDate} and #{doendDate}
+	 	<if test="endDate!=null and endDate!=''">
+				AND r.task_time &lt;=  #{endDate}
+	 	</if>
+	 	<if test="dobeginDate!=null and dobeginDate!='' ">
+				AND r.edit_time  &gt;=  #{dobeginDate} 
+		</if> 
+		<if test="doendDate!=null and doendDate!=''">
+				AND r.edit_time &lt;=  #{doendDate}
 		</if> 
     	
     	<!-- 数据范围过滤 -->