From a4c5db20ce75b4620e75ea5089a977835ef921c0 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Dec 2016 18:31:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/AntExRecordQuery.java | 10 +++++++--- .../lyms/platform/operate/web/facade/AntExRecordFacade.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index c98cf22..f7f5980 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -167,11 +167,15 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery } } - if (null != dueDateStart && dueDateEnd != null) { + if (null != dueDateStart) { + c = Criteria.where("dueDate").gte(dueDateStart); + } + + if (null != dueDateEnd) { if (null != c) { - c = c.where("dueDate").gte(dueDateStart).lte(dueDateEnd); + c = c.lte(dueDateEnd); } else { - c = Criteria.where("dueDate").gte(dueDateStart).lte(dueDateEnd); + c = Criteria.where("dueDate").lte(dueDateEnd); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 98f0581..fc62c88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -101,7 +101,7 @@ public class AntExRecordFacade { String[] dates = nextDateStr.split(" - "); antExRecordQuery.setDueDateStart(DateUtil.parseYMD(dates[0])); if (dates.length == 2) { - antExRecordQuery.setDueDateEnd(DateUtil.parseYMD(dates[0])); + antExRecordQuery.setDueDateEnd(DateUtil.parseYMD(dates[1])); } } -- 1.8.3.1