From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 17:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java |  218 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 114 insertions(+), 104 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java
index 57fafed..36a7ea6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java
@@ -1,105 +1,115 @@
-package com.yeshi.fanli.dao.mybatis.homemodule;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.homemodule.Special;
-
-public interface SpecialMapper extends BaseMapper<Special>{
-
-	
-	int deleteBatchByPrimaryKey(List<Long> list);
-	
-	int deleteBatchByCardID(List<Long> list);
-	/**
-	 * 鎵归噺鏌ヨid
-	 * @param list
-	 * @return
-	 */
-	List<Special> queryByListPrimaryKey(List<Long> list);
-	
-	/**
-	 * 鎵归噺鏌ヨCardID
-	 * @param list
-	 * @return
-	 */
-	List<Special> queryByListCardID(List<Long> list);
-	
-	/**
-	 * 鏌ヨ闇�鏇挎崲椤哄簭鏁版嵁
-	 * @param cardId
-	 * @param type
-	 * @param order
-	 * @return
-	 */
-	Special getOrderByCardID(@Param("cardId") Long cardId, @Param("type") Integer type, 
-			@Param("order") Integer order, @Param("sex")Integer sex);
-	
-	
-	/**
-	 * 鍚庣鏌ヨ鍒楄〃
-	 * @param start
-	 * @param count
-	 * @param card
-	 * @param key
-	 * @param sex
-	 * @return
-	 */
-	List<Special> listQueryByCard(@Param("start") long start, @Param("count") int count,
-			@Param("cardId") Long card, @Param("key") String key, @Param("sex")Integer sex);
-	
-	long countlistQueryByCard(@Param("cardId") Long card, @Param("key") String key, @Param("sex")Integer sex);
-	
-	
-	/**
-	 *   榛樿鏈�澶х殑鎺掑簭鍊�
-	 * @param card
-	 * @return
-	 */
-	int getDefaultMaxOrder(@Param("cardId") Long cardId);
-	
-
-	/**
-	 *   榛樿鏈�澶х殑鎺掑簭鍊�
-	 * @param card
-	 * @return
-	 */
-	int getManMaxOrder(@Param("cardId") Long cardId);
-	
-
-	/**
-	 *   榛樿鏈�澶х殑鎺掑簭鍊�
-	 * @param card
-	 * @return
-	 */
-	int getWomanMaxOrder(@Param("cardId") Long cardId);
-	
-	/**
-	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�
-	 * @param card
-	 * @param systemId
-	 * @return
-	 */
-	List<Special> listBySystemAndCard(@Param("card") String card, @Param("systemId") Long systemId);
-	
-	/**
-	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�-鍒嗛〉
-	 * @param card
-	 * @param systemId
-	 * @return
-	 */
-	List<Special> listPageBySystemAndCard(@Param("start") long start, @Param("count") int count, 
-			@Param("card") String card, @Param("systemId") Long systemId);
-	
-	
-	/**
-	 * 鏍规嵁浣嶇疆鏍囪瘑鏌ヨ
-	 * @param card
-	 * @param systemId
-	 * @return
-	 */
-	List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex);
-	
+package com.yeshi.fanli.dao.mybatis.homemodule;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.homemodule.Special;
+
+public interface SpecialMapper extends BaseMapper<Special>{
+
+	
+	int deleteBatchByPrimaryKey(List<Long> list);
+	
+	int deleteBatchByCardID(List<Long> list);
+	/**
+	 * 鎵归噺鏌ヨid
+	 * @param list
+	 * @return
+	 */
+	List<Special> queryByListPrimaryKey(List<Long> list);
+	
+	/**
+	 * 鎵归噺鏌ヨCardID
+	 * @param list
+	 * @return
+	 */
+	List<Special> queryByListCardID(List<Long> list);
+	
+	/**
+	 * 鏌ヨ闇�鏇挎崲椤哄簭鏁版嵁
+	 * @param cardId
+	 * @param type
+	 * @param order
+	 * @return
+	 */
+	Special getOrderByCardID(@Param("cardId") Long cardId, @Param("type") Integer type, 
+			@Param("order") Integer order, @Param("sex")Integer sex);
+	
+	
+	/**
+	 * 鍚庣鏌ヨ鍒楄〃
+	 * @param start
+	 * @param count
+	 * @param card
+	 * @param key
+	 * @param sex
+	 * @return
+	 */
+	List<Special> listQueryByCard(@Param("start") long start, @Param("count") int count,
+			@Param("cardId") Long card, @Param("key") String key, @Param("sex")Integer sex);
+	
+	long countlistQueryByCard(@Param("cardId") Long card, @Param("key") String key, @Param("sex")Integer sex);
+	
+	
+	/**
+	 *   榛樿鏈�澶х殑鎺掑簭鍊�
+	 * @param card
+	 * @return
+	 */
+	int getDefaultMaxOrder(@Param("cardId") Long cardId);
+	
+
+	/**
+	 *   榛樿鏈�澶х殑鎺掑簭鍊�
+	 * @param card
+	 * @return
+	 */
+	int getManMaxOrder(@Param("cardId") Long cardId);
+	
+
+	/**
+	 *   榛樿鏈�澶х殑鎺掑簭鍊�
+	 * @param card
+	 * @return
+	 */
+	int getWomanMaxOrder(@Param("cardId") Long cardId);
+	
+	/**
+	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�
+	 * @param card
+	 * @param systemId
+	 * @return
+	 */
+	List<Special> listBySystemAndCard(@Param("card") String card, @Param("systemId") Long systemId);
+	
+	/**
+	 * 鏌ヨ鏈夋晥涓撻-鐗堟湰鍖哄垎
+	 * @param card
+	 * @param systemId
+	 * @return
+	 */
+	List<Special> listByVersion(@Param("start") long start, @Param("count") int count, 
+			@Param("card") String card, @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);
+	
+	
+	/**
+	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�-鍒嗛〉
+	 * @param card
+	 * @param systemId
+	 * @return
+	 */
+	List<Special> listPageBySystemAndCard(@Param("start") long start, @Param("count") int count, 
+			@Param("card") String card, @Param("systemId") Long systemId);
+	
+	
+	/**
+	 * 鏍规嵁浣嶇疆鏍囪瘑鏌ヨ
+	 * @param card
+	 * @param systemId
+	 * @return
+	 */
+	List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0