From a27bd73ebc6ce57b026cb89a5846c51433cbdaa6 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 22 Jun 2018 11:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/AntExChuQuery.java     | 28 ++++++++++++++++++++++
 .../java/com/lyms/platform/query/AntExQuery.java   | 11 +++++++++
 2 files changed, 39 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
index aa3f612..d35045e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
@@ -26,6 +26,10 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery {
     private Date nextCheckTime;
     private Date nextCheckTimeStart;
     private Date nextCheckTimeEnd;
+
+    private Date createdTimeStart;
+    private Date createdTimeEnd;
+
     //大于修改时间
     private Date gteModified;
     private Date gteCreated;
@@ -39,6 +43,22 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private boolean isOpinion;
 
+    public Date getCreatedTimeStart() {
+        return createdTimeStart;
+    }
+
+    public void setCreatedTimeStart(Date createdTimeStart) {
+        this.createdTimeStart = createdTimeStart;
+    }
+
+    public Date getCreatedTimeEnd() {
+        return createdTimeEnd;
+    }
+
+    public void setCreatedTimeEnd(Date createdTimeEnd) {
+        this.createdTimeEnd = createdTimeEnd;
+    }
+
     public boolean isOpinion() {
         return isOpinion;
     }
@@ -230,6 +250,14 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
+        if (null != createdTimeStart && createdTimeEnd != null) {
+            if (null != c) {
+                c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            } else {
+                c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            }
+        }
+
         if (null != gteModified && null != gteCreated) {
             MongoCondition  mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
             MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java
index a99c41a..58c971c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java
@@ -42,6 +42,9 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private boolean isOpinion;
 
+    private Date createdTimeStart;
+    private Date createdTimeEnd;
+
     public boolean isOpinion() {
         return isOpinion;
     }
@@ -195,6 +198,14 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery {
         }
 
 
+        if (null != createdTimeStart && createdTimeEnd != null) {
+            if (null != c) {
+                c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            } else {
+                c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            }
+        }
+
         if (null != end) {
             if (isAddStart) {
                 if(neEnd){
-- 
1.8.3.1