From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
index dd6a9a9..c3c6e61 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
@@ -106,7 +106,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -144,7 +144,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -209,7 +209,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -278,7 +278,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -339,7 +339,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -404,6 +404,7 @@
// 鏌ヨ鏉′欢
List<Criteria> list = new ArrayList<Criteria>();
list.add(Criteria.where("bossUid").is(uid));
+ list.add(Criteria.where("result.firstNum").gt(0));
if (minDate != null) {
minDate = DateUtil.reduceDay(minDate, 1);
list.add(Criteria.where("result.countDay").gt(minDate));
--
Gitblit v1.8.0