From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 15:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
index 8ad668a..20c7880 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
@@ -115,7 +115,8 @@
 	 * @param uid
 	 * @return
 	 */
-	List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+	List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+			@Param("listId")List<Long> listId);
 
 	/**
 	 * 鏌ヨ浜岀骇闃熷憳
@@ -124,23 +125,39 @@
 	 * @param uid
 	 * @return
 	 */
-	List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+	List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+			@Param("listId")List<Long> listId);
 	
 	/**
 	 * 缁熻涓�绾ч槦鍛�
 	 * @param uid
 	 * @return
 	 */
-	long countFirstTeam(@Param("uid") Long uid);
+	long countFirstTeam(@Param("uid") Long uid, @Param("listId")List<Long> listId);
 	
 	/**
 	 * 缁熻浜岀骇闃熷憳
 	 * @param uid
 	 * @return
 	 */
-	long countSecondTeam(@Param("uid") Long uid);
+	long countSecondTeam(@Param("uid") Long uid, @Param("listId")List<Long> listId);
 
 
+	
+	/**
+	 * 缁熻涓�绾ч槦鍛�
+	 * @param uid
+	 * @return
+	 */
+	long countFirstTeamByDate(@Param("uid") Long uid, @Param("dayType")int dayType);
+	
+	/**
+	 * 缁熻浜岀骇闃熷憳
+	 * @param uid
+	 * @return
+	 */
+	long countSecondTeamByDate(@Param("uid") Long uid, @Param("dayType")int dayType);
+	
 	/**
 	 * 鏍规嵁id銆乽id鏌ヨ
 	 * 

--
Gitblit v1.8.0