From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java |   88 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java
index 2e06dab..2d78090 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java
@@ -4,21 +4,11 @@
 
 import org.apache.ibatis.annotations.Param;
 
+import com.yeshi.fanli.dao.BaseMapper;
 import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
 
-public interface HomeNavbarMapper {
+public interface HomeNavbarMapper extends BaseMapper<HomeNavbar>{
 
-	int deleteByPrimaryKey(Long id);
-
-	int insert(HomeNavbar record);
-
-	int insertSelective(HomeNavbar record);
-
-	HomeNavbar selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(HomeNavbar record);
-
-	int updateByPrimaryKey(HomeNavbar record);
 	
 	/**
 	 * 鏍规嵁涓婚敭鎵归噺鍒犻櫎
@@ -28,11 +18,27 @@
 	int deleteBatchByPrimaryKey(List<Long> list);
 	
 	/**
-	 * 鑾峰彇鏈�澶х殑鎺掑簭鍊�
+	 *   榛樿鏈�澶х殑鎺掑簭鍊�
 	 * @param card
 	 * @return
 	 */
-	int getMaxOrder();
+	int getDefaultMaxOrder();
+	
+
+	/**
+	 *   榛樿鏈�澶х殑鎺掑簭鍊�
+	 * @param card
+	 * @return
+	 */
+	int getManMaxOrder();
+	
+
+	/**
+	 *   榛樿鏈�澶х殑鎺掑簭鍊�
+	 * @param card
+	 * @return
+	 */
+	int getWomanMaxOrder();
 	
 	/**
 	 * 鏌ヨ浜ゆ崲鎺掑簭瀵硅薄
@@ -40,7 +46,26 @@
 	 * @param order 鎺掑簭鍊�
 	 * @return
 	 */
-	List<HomeNavbar> getChangeOrder(@Param("id") Long id, @Param("type") Integer type, @Param("order") Integer order);
+	HomeNavbar getDefaultChangeOrder(@Param("type") Integer type, @Param("order") Integer order);
+	
+	
+	/**
+	 * 鏌ヨ浜ゆ崲鎺掑簭瀵硅薄
+	 * @param type 
+	 * @param order 鎺掑簭鍊�
+	 * @return
+	 */
+	HomeNavbar getManChangeOrder(@Param("type") Integer type, @Param("order") Integer order);
+	
+	
+	/**
+	 * 鏌ヨ浜ゆ崲鎺掑簭瀵硅薄
+	 * @param type 
+	 * @param order 鎺掑簭鍊�
+	 * @return
+	 */
+	HomeNavbar getWomanChangeOrder(@Param("type") Integer type, @Param("order") Integer order);
+	
 	
 	/**
 	 * 鍚庣鍒楄〃鏌ヨ
@@ -49,7 +74,36 @@
 	 * @param key
 	 * @return
 	 */
-	List<HomeNavbar> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key);
+	List<HomeNavbar> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key, @Param("sex") Integer sex);
 	
-	long countListQuery(@Param("key") String key);
+	long countListQuery(@Param("key") String key, @Param("sex") Integer sex);
+	
+	/**
+	 * 鏌ヨ鏈夋晥瀵艰埅鏍�
+	 * @return
+	 */
+	List<HomeNavbar> listQueryEffective();
+	
+	
+	/**
+	 * 榛樿瀵艰埅鏍�
+	 * @return
+	 */
+	List<HomeNavbar> listQueryDefaultNavbar(@Param("sex") Integer sex);
+	
+	
+	/**
+	 *  鍥哄畾瀵艰埅鏍�
+	 * @return
+	 */
+	List<HomeNavbar> listQueryFixedNavbar();
+	
+	
+	/**
+	 * 鏍规嵁鍒嗙被鏌ヨ鏈夋晥瀵艰埅鏍�
+	 * @param classId
+	 * @return
+	 */
+	HomeNavbar getEffectiveByClassId(@Param("classId") Long classId);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0