From a1a2cf7535373390f7cb29fb4e7c4f7a22a0a915 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期六, 22 二月 2020 18:38:57 +0800
Subject: [PATCH] 动态发圈-素材

---
 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