From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 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 3f11a62..8c2a470 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
@@ -4,21 +4,11 @@
 
 import org.apache.ibatis.annotations.Param;
 
+import com.yeshi.fanli.dao.BaseMapper;
 import com.yeshi.fanli.entity.bus.homemodule.Special;
 
-public interface SpecialMapper {
+public interface SpecialMapper extends BaseMapper<Special>{
 
-	int deleteByPrimaryKey(Long id);
-
-	int insert(Special record);
-
-	int insertSelective(Special record);
-
-	Special selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(Special record);
-
-	int updateByPrimaryKey(Special record);
 	
 	int deleteBatchByPrimaryKey(List<Long> list);
 	
@@ -44,8 +34,7 @@
 	 * @param order
 	 * @return
 	 */
-	List<Special> getOrderByCardID(@Param("cardId") Long cardId, @Param("type") Integer type,
-			@Param("order") Integer order);
+	Special getOrderByCardID(@Param("cardId") Long cardId, @Param("type") Integer type,@Param("order") Integer order);
 	
 	
 	List<Special> listQueryByCard(@Param("start") long start, @Param("count") int count,
@@ -58,7 +47,7 @@
 	 * @param card
 	 * @return
 	 */
-	int getMaxOrderByCard(@Param("cardId") Long card);
+	int getMaxOrderByCard(@Param("cardId") Long cardId);
 	
 	/**
 	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�
@@ -68,4 +57,22 @@
 	 */
 	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);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0