From 121c5ee5345d366ae4aadf7901af9b0678dbb7a8 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 00:24:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 8edaece..32b58fd 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
@@ -65,8 +65,9 @@
*
* @return
*/
- public List<GoodsEvaluate> query(int start, int count, String key, Integer state) {
+ public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType) {
Query query = new Query();
+ query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
if (state != null) {
query.addCriteria(Criteria.where("state").is(state));
}
@@ -79,8 +80,10 @@
return mongoTemplate.find(query, GoodsEvaluate.class);
}
- public long count(String key, Integer state) {
+ public long count(String key, Integer state, int dynamicType) {
Query query = new Query();
+ query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
+
if (state != null) {
query.addCriteria(Criteria.where("state").is(state));
}
@@ -97,9 +100,10 @@
* @param key
* @return
*/
- public List<GoodsEvaluate> queryValid(int start, int count) {
+ public List<GoodsEvaluate> queryValid(int start, int count, int dynamicType) {
Date now = new Date();
Query query = new Query();
+ query.addCriteria(Criteria.where("state").is(dynamicType));
query.addCriteria(Criteria.where("state").is(1));
query.addCriteria(Criteria.where("startTime").lte(now));
query.addCriteria(Criteria.where("endTime").gte(now));
@@ -113,9 +117,10 @@
* @param key
* @return
*/
- public long countValid() {
+ public long countValid(int dynamicType) {
Date now = new Date();
Query query = new Query();
+ query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
query.addCriteria(Criteria.where("state").is(1));
query.addCriteria(Criteria.where("startTime").lte(now));
query.addCriteria(Criteria.where("endTime").gte(now));
--
Gitblit v1.8.0