From 1770eb0a01b3f2ef92f416b67d25160d3ced9625 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 06 十二月 2018 18:09:46 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java | 266 +++++++++++++++++++++++++++-------------------------
1 files changed, 139 insertions(+), 127 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 6b833fc..1af529b 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
@@ -26,23 +26,24 @@
int updateByPrimaryKey(ThreeSale record);
int effectThreeSale(Long workerUid);
-
+
/**
* 鏌ヨ涓�搴﹂槦鍛橀泦鍚�
+ *
* @param start
* @param count
* @param key
* @param uid
* @return
*/
- List<ThreeSale> queryMyFirstTeamList(@Param("start") int start, @Param("count") int count,
- @Param("key") String key,@Param("bossId") Long bossId);
-
- long queryCountMyFirstTeamList(@Param("key") String key,@Param("bossId") Long bossId);
-
-
- /**
+ List<ThreeSale> queryMyFirstTeamList(@Param("start") int start, @Param("count") int count, @Param("key") String key,
+ @Param("bossId") Long bossId);
+
+ long queryCountMyFirstTeamList(@Param("key") String key, @Param("bossId") Long bossId);
+
+ /**
* 鏌ヨ浜屽害闃熷憳闆嗗悎
+ *
* @param start
* @param count
* @param key
@@ -50,127 +51,138 @@
* @return
*/
List<ThreeSale> queryMySecondTeamList(@Param("start") int start, @Param("count") int count,
- @Param("key") String key,@Param("bossId") Long bossId);
-
- long queryCountMySecondTeamList(@Param("key") String key,@Param("bossId") Long bossId);
-
-
- /**
- * 闀挎椂闂存湭閭�璇锋垚鍔熺敤鎴�
- * @param daysNum
- * @return
- */
- List<Long> queryLongTimeFailed(@Param("daysNum") int daysNum);
-
-
- /**
- * 闀挎椂闂� 閭�璇锋垚鍔熺敤鎴�
- * @param daysNum
- * @return
- */
- List<ThreeSale> queryLongTimeSuccess(@Param("daysNum") int daysNum);
-
-
- /**
- * 璁剧疆瀵瑰簲閭�璇疯繃鏈�
- * @param list
- * @return
- */
- int updateExpire(List<Long> list);
-
- /**
- * 涓�绾ф煡璇�
- * @param start
- * @param count
- * @param key
- * @param startTime
- * @param endTime
- * @return
- */
- List<ThreeSale> listFirstTeamQuery(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
- @Param("state")Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
- long countFirstTeamQuery(@Param("uid") Long uid, @Param("state")Integer state, @Param("startTime") String startTime,
- @Param("endTime") String endTime);
-
-
- /**
- * 浜岀骇鏌ヨ
- * @param start
- * @param count
- * @param key
- * @param startTime
- * @param endTime
- * @return
- */
- List<ThreeSale> listSecondTeamQuery(@Param("start")long start, @Param("count")int count, @Param("uid")Long uid,
- @Param("state")Integer state, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
- long countSecondTeamQuery(@Param("uid")Long uid, @Param("state")Integer state, @Param("startTime")String startTime,
- @Param("endTime") String endTime);
-
-
-
- /**
- * 涓婄骇鏌ヨ
- * @param start
- * @param count
- * @param uid
- * @return
- */
- List<ThreeSale> listSuperiorQuery(@Param("start") long start, @Param("count") int count,
- @Param("state")Integer state, @Param("uid") Long uid);
-
- long countSuperiorQuery(@Param("state")Integer state, @Param("uid") Long uid);
-
-
- /**
- * 鏌ヨ涓�绾ч槦鍛�
- * @param paramLong
- * @param paramInt
- * @param paramLong1
- * @return
- */
- List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+ @Param("key") String key, @Param("bossId") Long bossId);
- /**
- * 缁熻涓�绾ч槦鍛�
- * @param uid
- * @param state
- * @return
- */
- long countFirstTeam(@Param("uid") Long uid, @Param("state") Integer state);
+ long queryCountMySecondTeamList(@Param("key") String key, @Param("bossId") Long bossId);
- /**
- * 鏌ヨ浜岀骇闃熷憳
- * @param start
- * @param count
- * @param uid
- * @return
- */
- List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+ /**
+ * 闀挎椂闂存湭閭�璇锋垚鍔熺敤鎴�
+ *
+ * @param daysNum
+ * @return
+ */
+ List<Long> queryLongTimeFailed(@Param("daysNum") int daysNum);
- /**
- * 缁熻浜岀骇闃熷憳
- * @param uid
- * @param state
- * @return
- */
- long countSecondTeam(@Param("uid") Long uid, @Param("state") Integer state);
+ /**
+ * 闀挎椂闂� 閭�璇锋垚鍔熺敤鎴�
+ *
+ * @param daysNum
+ * @return
+ */
+ List<ThreeSale> queryLongTimeSuccess(@Param("daysNum") int daysNum);
- /**
- *
- * @param uid
- * @return
- */
- ThreeSale getMyBoss(@Param("uid") Long uid);
-
- /**
- * 鏍规嵁id銆乽id鏌ヨ
- * @param id
- * @param uid
- * @return
- */
- List<ThreeSale> listbyIdAndBossId(@Param("id")Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
-
+ /**
+ * 璁剧疆瀵瑰簲閭�璇疯繃鏈�
+ *
+ * @param list
+ * @return
+ */
+ int updateExpire(List<Long> list);
+
+ /**
+ * 涓�绾ф煡璇�
+ *
+ * @param start
+ * @param count
+ * @param key
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<ThreeSale> listFirstTeamQuery(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+ @Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ long countFirstTeamQuery(@Param("uid") Long uid, @Param("state") Integer state,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ /**
+ * 浜岀骇鏌ヨ
+ *
+ * @param start
+ * @param count
+ * @param key
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<ThreeSale> listSecondTeamQuery(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+ @Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ long countSecondTeamQuery(@Param("uid") Long uid, @Param("state") Integer state,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ /**
+ * 涓婄骇鏌ヨ
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ List<ThreeSale> listSuperiorQuery(@Param("start") long start, @Param("count") int count,
+ @Param("state") Integer state, @Param("uid") Long uid);
+
+ long countSuperiorQuery(@Param("state") Integer state, @Param("uid") Long uid);
+
+ /**
+ * 鏌ヨ涓�绾ч槦鍛�
+ *
+ * @param paramLong
+ * @param paramInt
+ * @param paramLong1
+ * @return
+ */
+ List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+
+ /**
+ * 缁熻涓�绾ч槦鍛�
+ *
+ * @param uid
+ * @param state
+ * @return
+ */
+ long countFirstTeam(@Param("uid") Long uid, @Param("state") Integer state);
+
+ /**
+ * 鏌ヨ浜岀骇闃熷憳
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+
+ /**
+ * 缁熻浜岀骇闃熷憳
+ *
+ * @param uid
+ * @param state
+ * @return
+ */
+ long countSecondTeam(@Param("uid") Long uid, @Param("state") Integer state);
+
+ /**
+ *
+ * @param uid
+ * @return
+ */
+ ThreeSale getMyBoss(@Param("uid") Long uid);
+
+ /**
+ * 鏍规嵁id銆乽id鏌ヨ
+ *
+ * @param id
+ * @param uid
+ * @return
+ */
+ List<ThreeSale> listbyIdAndBossId(@Param("id") Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
+
+ /**
+ * 鏍规嵁閭�璇疯�匢D鏌ヨ鍏崇郴
+ *
+ * @param workerId
+ * @return
+ */
+ List<ThreeSale> listByWorkerId(Long workerId);
}
\ No newline at end of file
--
Gitblit v1.8.0