From e05d350a635020ef9e8a35cf239e7067b948a373 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sat, 24 Aug 2019 17:16:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/MatdeliverFollowFacade.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
index e669a82..5e2de2c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
@@ -846,7 +846,7 @@ public class MatdeliverFollowFacade {
         String endFmTime = param.getEndFmTime();
         if (StringUtils.isNotEmpty(startFmTime) && StringUtils.isNotEmpty(endFmTime)) {
             Date start = DateUtil.parseYMD(startFmTime);
-            Date end = DateUtil.parseYMD(endFmTime);
+            Date end = DateUtil.parseYMDEnd(endFmTime);
             query.addCriteria(Criteria.where("dueDate").gte(start).lte(end));
         }
 
@@ -855,7 +855,7 @@ public class MatdeliverFollowFacade {
         String endSendTime = param.getEndSendTime();
         if (StringUtils.isNotEmpty(startSendTime) && StringUtils.isNotEmpty(endSendTime)) {
             Date start = DateUtil.parseYMD(startSendTime);
-            Date end = DateUtil.parseYMD(endSendTime);
+            Date end = DateUtil.parseYMDEnd(endSendTime);
             query.addCriteria(Criteria.where("sendTime").gte(start).lte(end));
         }
 
@@ -864,7 +864,7 @@ public class MatdeliverFollowFacade {
         String endWriteTime = param.getEndWriteTime();
         if (StringUtils.isNotEmpty(startWriteTime) && StringUtils.isNotEmpty(endWriteTime)) {
             Date start = DateUtil.parseYMD(startWriteTime);
-            Date end = DateUtil.parseYMD(endWriteTime);
+            Date end = DateUtil.parseYMDEnd(endWriteTime);
             query.addCriteria(Criteria.where("writeTime").gte(start).lte(end));
         }
 
@@ -873,7 +873,7 @@ public class MatdeliverFollowFacade {
         String endConfirmTime = param.getEndConfirmTime();
         if (StringUtils.isNotEmpty(startConfirmTime) && StringUtils.isNotEmpty(endConfirmTime)) {
             Date start = DateUtil.parseYMD(startConfirmTime);
-            Date end = DateUtil.parseYMD(endConfirmTime);
+            Date end = DateUtil.parseYMDEnd(endConfirmTime);
             query.addCriteria(Criteria.where("confirmTime").gte(start).lte(end));
         }
 
-- 
1.8.3.1