From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java |   40 ++++++++++++----------------------------
 1 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
index eead433..d168609 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
@@ -2,11 +2,14 @@
 
 import java.util.List;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo;
 import com.yeshi.fanli.entity.bus.homemodule.Special;
 import com.yeshi.fanli.exception.homemodule.SpecialException;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
 
 import net.sf.json.JSONObject;
 
@@ -22,7 +25,7 @@
 	public Special selectByPrimaryKey(Long id);
 
 
-	public List<Special> listQueryByCard(long start, int count, Long card, String key, Integer sex);
+	public List<SpecialVO> listQueryByCard(long start, int count, Long card, String key, Integer sex);
 
 	public long countlistQueryByCard(Long card, String key, Integer sex);
 
@@ -44,25 +47,6 @@
 	public int deleteBatchByCardID(List<Long> list) throws Exception;
 
 	/**
-	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�
-	 * @param card
-	 * @param systemId
-	 * @return
-	 */
-	public List<Special> listBySystemAndCard(String card, Long systemId);
-
-	/**
-	 * 娲诲姩鍒楄〃-鍒嗛〉
-	 * @param start
-	 * @param count
-	 * @param card
-	 * @param systemId
-	 * @return
-	 */
-	public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId);
-
-
-	/**
 	 * 淇濆瓨
 	 * @param file
 	 * @param record
@@ -70,7 +54,8 @@
 	 * @throws SpecialException
 	 * @throws Exception
 	 */
-	public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record, String jumpType) throws SpecialException, Exception;
+	public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record
+			, String jumpType, CommonShareInfo shareInfo) throws SpecialException, Exception;
 
 	/**
 	 * 鏇存崲椤哄簭
@@ -86,7 +71,7 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public JSONObject listCacheSpecialToIndex(AcceptData acceptData, Integer sex) throws Exception;
+	public JSONObject listCacheSpecialToIndex(AcceptData acceptData, Integer sex,SystemEnum system) throws Exception;
 
 
 	/**
@@ -94,7 +79,7 @@
 	 * @param placeKey
 	 * @return
 	 */
-	public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode);
+	public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode,SystemEnum system);
 
 
 	/**
@@ -102,12 +87,11 @@
 	 * @param start
 	 * @param count
 	 * @param card
-	 * @param systemId
 	 * @param platform
 	 * @param versionCode
 	 * @return
 	 */
-	public List<Special> listByVersion(long start, int count, String card, String platform, Integer versionCode);
+	public List<SpecialVO> listByVersion(long start, int count, String card, String platform, Integer versionCode,SystemEnum system);
 
 
 	/**
@@ -117,10 +101,10 @@
 	 * @param versionCode
 	 * @return
 	 */
-	public List<Special> listByPlaceKeyList(long start, int count, List<String> list, Integer platform, Integer versionCode);
+	public List<Special> listByPlaceKeyList(long start, int count, List<String> list, Integer platform, Integer versionCode,SystemEnum system);
 
 
-	public long countByPlaceKeyList(List<String> list, Integer platform, Integer versionCode);
+	public long countByPlaceKeyList(List<String> list, Integer platform, Integer versionCode,SystemEnum system);
 
 
 	/**
@@ -130,7 +114,7 @@
 	 * @param versionCode
 	 * @return
 	 */
-	public List<Special> listByPlaceKeyHasLabel(long start, int count, List<String> list, Integer platform, Integer versionCode);
+	public List<SpecialVO> listByPlaceKeyHasLabel(long start, int count, List<String> list, Integer platform, Integer versionCode,SystemEnum system);
 	
 	
 	/**

--
Gitblit v1.8.0