From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 36a7ea6..d48b35e 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
@@ -91,7 +91,7 @@
* @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("placeKey") String placeKey, @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);
/**
@@ -110,6 +110,35 @@
* @param systemId
* @return
*/
- List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex);
+ List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex
+ , @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);
+
+
+ /**
+ * 鏍规嵁澶氫釜浣嶇疆鏍囪瘑鏌ヨ
+ * @param list
+ * @param sex
+ * @param platform
+ * @param versionCode
+ * @return
+ */
+ List<Special> listByPlaceKeyList(@Param("start")long start, @Param("count")int count,@Param("list") List<String> list, @Param("sex")Integer sex
+ , @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);
+
+ long countByPlaceKeyList(@Param("list") List<String> list, @Param("sex")Integer sex
+ , @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);
+
+
+
+ /**
+ * 鏍规嵁澶氫釜浣嶇疆鏍囪瘑鏌ヨ
+ * @param list
+ * @param sex
+ * @param platform
+ * @param versionCode
+ * @return
+ */
+ List<Special> listByPlaceKeyHasLabel(@Param("start")long start, @Param("count")int count,@Param("list") List<String> list, @Param("sex")Integer sex
+ , @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);
}
\ No newline at end of file
--
Gitblit v1.8.0