From 11dc10e5d72d0c8969294d55985882a0631354d0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 18:20:59 +0800
Subject: [PATCH] 队员统计表数据同步处理

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index 47cd41c..e0da364 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -257,7 +257,7 @@
 
 	@Override
 	public JSONObject getMyFirstTeam(long start, int count, Long uid) {
-		List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid,null);
+		List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, null);
 		if (list == null) {
 			list = new ArrayList<ThreeSale>();
 		}
@@ -517,7 +517,7 @@
 	public long countSecondTeam(Long uid) {
 		return threeSaleMapper.countSecondTeam(uid, null);
 	}
-	
+
 	@Override
 	public long countFirstTeam(Long uid, List<Long> listId) {
 		return threeSaleMapper.countFirstTeam(uid, listId);
@@ -537,9 +537,7 @@
 	public long countSecondTeamByDate(Long uid, int dayType) {
 		return threeSaleMapper.countSecondTeamByDate(uid, dayType);
 	}
-	
-	
-	
+
 	@Override
 	public ThreeSale selectLatestByWorkerIdAndState(Long workerId, int state) {
 		return threeSaleMapper.selectLatestByWorkerIdAndState(workerId, state);
@@ -597,8 +595,15 @@
 	}
 
 	@Override
-	public List<ThreeSale> listAll(int page, int pageSize) {
-		return threeSaleMapper.listAll((page-1)*pageSize, pageSize);
+	public List<ThreeSale> listAll(Date minTime, Date maxTime, int page, int pageSize) {
+		return threeSaleMapper.listAll(minTime == null ? null : minTime.getTime(),
+				maxTime == null ? null : maxTime.getTime(), (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long countAll(Date minTime, Date maxTime) {
+		return threeSaleMapper.countAll(minTime == null ? null : minTime.getTime(),
+				maxTime == null ? null : maxTime.getTime());
 	}
 
 }

--
Gitblit v1.8.0