From 235921d820f29b04b1e82f6a6f0d4a1957a900ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 12:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
index 3dd53e0..e4596ce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
@@ -16,6 +16,7 @@
import com.yeshi.fanli.dto.user.ThreeSaleFocusDTO;
import com.yeshi.fanli.entity.bus.user.TeamFansInfo;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
@Repository
public class TeamFansInfoDao extends MongodbBaseDao<TeamFansInfo> {
@@ -104,9 +105,7 @@
}
private Query createQuery(int type, Long uid, ThreeSaleFocusDTO focusDTO) {
- Query query = new Query();
List<Criteria> list = new ArrayList<Criteria>();
-
if (type == 1) {
list.add(Criteria.where("bossId").is(uid));
} else {
@@ -132,21 +131,9 @@
if (focusDTO.getMaxFansNum() != null)
list.add(Criteria.where("fansNum").lte(focusDTO.getMaxFansNum()));
- if (!StringUtil.isNullOrEmpty(focusDTO.getMinJoinTime()))
- list.add(Criteria.where("joinTime").gte(focusDTO.getMinJoinTime()));
-
- if (!StringUtil.isNullOrEmpty(focusDTO.getMaxJoinTime()))
- list.add(Criteria.where("joinTime").lte(focusDTO.getMaxJoinTime()));
-
- if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime()))
- list.add(Criteria.where("activeTime").gte(focusDTO.getMinActiveTime()));
-
- if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime()))
- list.add(Criteria.where("activeTime").lte(focusDTO.getMaxActiveTime()));
-
if (focusDTO.getMinIncome() != null) {
int income = focusDTO.getMinIncome().multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN).intValue();
- list.add(Criteria.where("income").lte(income));
+ list.add(Criteria.where("income").gte(income));
}
if (focusDTO.getMaxIncome() != null) {
@@ -154,6 +141,25 @@
list.add(Criteria.where("income").lte(income));
}
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMinJoinTime())) {
+ Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinJoinTime());
+ list.add(Criteria.where("joinTime").gte(date));
+ }
+
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMaxJoinTime())) {
+ Date date = TimeUtil.parseDotCommon(focusDTO.getMaxJoinTime() + " 23:59:59");
+ list.add(Criteria.where("joinTime").lte(date));
+ }
+
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime())) {
+ Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinActiveTime());
+ list.add(Criteria.where("joinTime").gte(date));
+ }
+
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime())) {
+ Date date = TimeUtil.parseDotCommon(focusDTO.getMaxActiveTime() + " 23:59:59");
+ list.add(Criteria.where("activeTime").lte(date));
+ }
if (!StringUtil.isNullOrEmpty(focusDTO.getKey())) {
if (type == 1) {
@@ -196,6 +202,7 @@
}
}
+ Query query = new Query();
if (list.size() > 0) {
Criteria[] cas = new Criteria[list.size()];
for (int i = 0; i < list.size(); i++)
--
Gitblit v1.8.0