From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java
index a09876d..ae198fb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java
@@ -332,8 +332,8 @@
List<Criteria> list = new ArrayList<Criteria>();
list.add(Criteria.where("dynamicType").is(1));
list.add(Criteria.where("state").is(1));
- list.add(Criteria.where("startTime").gt(new Date()));
- list.add(Criteria.where("startTime").lte(date));
+ list.add(Criteria.where("startTime").gt(date));
+ list.add(Criteria.where("startTime").lte(new Date()));
list.add(new Criteria().orOperator(Criteria.where("type").is("single"),
new Criteria().andOperator(Criteria.where("type").is("activity"))));
@@ -344,7 +344,7 @@
cas[i] = list.get(i);
query.addCriteria(new Criteria().andOperator(cas));
}
- query.with(new Sort(Sort.Direction.ASC,"startTime"));
+ query.with(new Sort(Sort.Direction.DESC,"startTime"));
return mongoTemplate.find(query, GoodsEvaluate.class);
}
--
Gitblit v1.8.0