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/SpecialMapper.java | 45 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 9 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 8c2a470..57fafed 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 @@ -34,20 +34,47 @@ * @param order * @return */ - 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, @Param("sex")Integer sex); - - List<Special> listQueryByCard(@Param("start") long start, @Param("count") int count, - @Param("cardId") Long card, @Param("key") String key); - - long countlistQueryByCard(@Param("cardId") Long card, @Param("key") String key); /** - * 鑾峰彇鏈�澶х殑鎺掑簭鍊� + * 鍚庣鏌ヨ鍒楄〃 + * @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 getMaxOrderByCard(@Param("cardId") Long cardId); + int getDefaultMaxOrder(@Param("cardId") Long cardId); + + + /** + * 榛樿鏈�澶х殑鎺掑簭鍊� + * @param card + * @return + */ + int getManMaxOrder(@Param("cardId") Long cardId); + + + /** + * 榛樿鏈�澶х殑鎺掑簭鍊� + * @param card + * @return + */ + int getWomanMaxOrder(@Param("cardId") Long cardId); /** * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰� @@ -73,6 +100,6 @@ * @param systemId * @return */ - List<Special> listByPlaceKey(@Param("placeKey") String placeKey); + List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex); } \ No newline at end of file -- Gitblit v1.8.0