From 1d1af3056b389f313b4037daa5b77af63117db4f Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Thu, 20 Oct 2016 09:31:59 +0800
Subject: [PATCH] update assconfig table name

---
 .../com/lyms/platform/query/LisCrisisItemQuery.java     | 17 +++++++++++++----
 .../java/com/lyms/platform/query/LisReportQuery.java    |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
index 15bd934..eb7b055 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
 import org.bson.types.ObjectId;
+import org.springframework.data.mongodb.core.query.Criteria;
 
 import java.util.Date;
 
@@ -236,14 +237,22 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
         if(null!=serviceStatus){
             condition=condition.and("serviceStatus",serviceStatus,MongoOper.IS);
         }
+        if(null!=age){
+            condition=condition.and("age",age,MongoOper.IS);
+        }
+        Criteria c1 = null;
         if(null!=startWeek){
-            condition=condition.and("week",startWeek,MongoOper.GTE);
+            c1 = Criteria.where("week").gte(startWeek);
         }
         if(null!=endWeek){
-            condition=condition.and("week",endWeek,MongoOper.LTE);
+            if (null==c1) {
+                c1 = Criteria.where("week").lte(endWeek);
+            } else {
+                c1 = c1.and("week").lte(endWeek);
+            }
         }
-        if(null!=age){
-            condition=condition.and("age",age,MongoOper.IS);
+        if (c1!=null) {
+            condition = condition.andCondition(new MongoCondition(c1));
         }
 
         return condition.toMongoQuery();
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
index 39ddae3..fa8034d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
@@ -62,7 +62,7 @@ public class LisReportQuery extends BaseQuery implements IConvertToNativeQuery {
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
         if (null != id) {
-            condition = condition.and("id", new ObjectId(id), MongoOper.IS);
+            condition = condition.and("id", id, MongoOper.IS);
         }
         if (null != status) {
             condition = condition.and("status", status, MongoOper.IS);
-- 
1.8.3.1