wanghui 7 lat temu
rodzic
commit
baf13afc71

+ 3 - 95
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -22,7 +22,6 @@ import com.goafanti.common.model.AchievementPublish;
 import com.goafanti.common.model.AftFile;
 import com.goafanti.common.service.BranchInformationService;
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.service.UserService;
 @RestController
 @RequestMapping(value = "/api/admin/achievement")
@@ -41,53 +40,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     AchievementPublishService	achievementPublishService;
     @Resource
     BranchInformationService	branchInformationService;
-    
-    /**
-     * 个人成果列表
-     */
-    @RequestMapping(value = "/userList", method = RequestMethod.GET)
-    private Result userList(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
-            Integer serialNumber, String name, String keyword, Integer category, Integer status,
-            String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String pageNo,
-            String pageSize,Integer boutique,Integer hot) {
-        Result res = new Result();
-        Integer pNo = 1;
-        Integer pSize = 10;
-        if (StringUtils.isNumeric(pageSize)) {
-            pSize = Integer.parseInt(pageSize);
-        }
-        if (StringUtils.isNumeric(pageNo)) {
-            pNo = Integer.parseInt(pageNo);
-        }
-       res.setData(achievementService.listUserOwnerAchievement(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
-       return res;
-    }
-    /**
-     * 组织用户成果列表(个人组织合并)
-     */
-    @RequestMapping(value = "/orgList", method = RequestMethod.GET)
-    private Result orgList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
-            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
-        Result res = new Result();
-        Integer pNo = 1;
-        Integer pSize = 10;
-        if (StringUtils.isNumeric(pageSize)) {
-            pSize = Integer.parseInt(pageSize);
-        }
-        if (StringUtils.isNumeric(pageNo)) {
-            pNo = Integer.parseInt(pageNo);
-        }
-        
-        Object o = achievementService.listOrgOwnerAchievement(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot, recordPerson);
-        
-        res.setData(o);
-        
-        
-        return res;
-    }
+     
     /**
      * 个人成果所有人列表
      */
@@ -205,51 +158,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         return res;
     }
  
-    /**
-     * 我的成果列表
-     */
-    @RequestMapping(value = "/myList", method = RequestMethod.GET)
-    private Result myList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
-            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
-        Result res = new Result();
-        Integer pNo = 1;
-        Integer pSize = 10;
-        if (StringUtils.isNumeric(pageSize)) {
-            pSize = Integer.parseInt(pageSize);
-        }
-        if (StringUtils.isNumeric(pageNo)) {
-            pNo = Integer.parseInt(pageNo);
-        }
-        String techBrokerId=TokenManager.getAdminId();
-        Object o = achievementService.listMyAchievement(techBrokerId,ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
-        res.setData(o);     
-        return res;
-    }
-    
-    /**
-     * 科技成果管理列表
-     */
-    @RequestMapping(value = "/manageList", method = RequestMethod.GET)
-    private Result manageList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
-            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
-        Result res = new Result();
-        Integer pNo = 1;
-        Integer pSize = 10;
-        if (StringUtils.isNumeric(pageSize)) {
-            pSize = Integer.parseInt(pageSize);
-        }
-        if (StringUtils.isNumeric(pageNo)) {
-            pNo = Integer.parseInt(pageNo);
-        }
-        String techBrokerId=TokenManager.getAdminId();
-        Object o = achievementService.listManageAchievement(techBrokerId,ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot,recordPerson);
-        res.setData(o);     
-        return res;
-    }
+ 
     /**
      * 成果发布
      */
@@ -259,8 +168,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     	if (StringUtils.isBlank(a.getAchievementId())) {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果", "成果"));
             return res;
-        }
-    	
+        }	
         res.setData(achievementPublishService.insertachievementPublish(a));     
         return res;
     }

+ 1 - 3
src/main/java/com/goafanti/achievement/controller/UserAchievementApiController.java

@@ -110,7 +110,7 @@ public class UserAchievementApiController extends CertifyApiController {
 		 Integer pageNo, Integer pageSize) {
 		Result res = new Result();
 		
-		res.setData(achievementService.listUserAchievement(auditStatus, name, dataCategory,
+		res.setData(achievementService.listMyAchievement(auditStatus, name, dataCategory,
 				 releaseDateStartDate, releaseDateEndDate, pageNo, pageSize));
 		return res;
 	}
@@ -334,8 +334,6 @@ public class UserAchievementApiController extends CertifyApiController {
 			return res;
 		}
 
-	
-
 		if (null == ia.getCooperationMode()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
 			return res;

+ 16 - 53
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -15,16 +15,9 @@ import com.goafanti.portal.bo.AchievementDetailBo;
 import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
-import com.goafanti.portal.bo.AchievementSearchListBo;
-import com.goafanti.portal.bo.BoutiqueListBo;
-import com.goafanti.portal.bo.InternationalListBo;
 
 public interface AchievementService {
 
-	Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
-			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
-
 	void saveAchievement(Achievement a, String[] keywords,List<String>webPages,List<String>appPages);
 
 	int updateAchievement(Achievement a, String[] keywords, Integer sIgnin,List<String>webPages,List<String>appPages);
@@ -33,7 +26,7 @@ public interface AchievementService {
 
 	int deleteByPrimaryKey(List<String> asList);
 
-	Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, String name,
+	Pagination<AchievementListBo> listMyAchievement(Integer auditStatus, String name,
 		 Integer dataCategory,  String releaseDateStartDate,
 			String releaseDateEndDate,  Integer pNo, Integer pSize);
 
@@ -41,10 +34,6 @@ public interface AchievementService {
 
 	int updateReleaseStatus(Achievement a);
 
-	Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
-			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot,String recordPerson);
-
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id );
 
 	AchievementOrgOwnerDetailBo selectOrgOwnerDetail(String id);
@@ -53,10 +42,6 @@ public interface AchievementService {
 
 	void insertImport(List<AchievementImportBo> data);
 
-	Pagination<AchievementSearchListBo> listAchievementSearchList(String url,
-			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
-			Integer timeSort,String upperPrice,String lowerPrice,Integer internationalFlag);
-
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
 	
 	Achievement selectAchievementDetail(String id);
@@ -72,21 +57,6 @@ public interface AchievementService {
 	List<AchievementPortalSimilarListBo> findByFieldA(Integer fieldA, String id, Integer type);
 
 	int updateByPrimaryKeySelective(Achievement a);
-	
-	/** 查询国际化技术 **/
-	List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementKey);
-	
-	/** 查询精品成果  **/
-	Pagination<BoutiqueListBo> boutiqueSearchList(Integer dataCategory,Integer category,Integer fieldA,Integer pageNo, Integer pageSize);
-	
-	/** 查询精品成果  **/
-	public List<AchievementListBo> getAchievement(Integer boutique);
-	 
-    /** 查询猜你喜欢  **/
-    public List<AchievementListBo>  getPerhapLike();
-    
-    /**查询智者的科技成果**/
-    public List<AchievementPartnerListBo> findPartnerAchievementList(String uid);
 
 	Pagination<AchievementPartnerListBo> listAppUserAchievement(Integer auditStatus, Integer serialNumber, String name, String keyword,Integer dataCategory,
 			Integer category, Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
@@ -99,28 +69,21 @@ public interface AchievementService {
 
 	int saveAppAchievement(Achievement a, String[] keywords);
 
-	Pagination<AchievementListBo> listManageAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
-			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot,String recordPerson);
-	
-	Pagination<AchievementListBo> listMyAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
-			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
-
-public List<AchievementObject> recentAchievements(int size,String url,String showLocation);
-
-public List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
-
-public List<AchievementObject>getPatentList(int size,String url,String showLocation);
-
-public List<AchievementObject>getPracticalTechnologys(int size,String url,String showLocation);
 
-List<PolicyEntity> getIntellectualProperty(int size);
-
-AchievementObject getAchievementDetail(String id,Integer type);
-
-List<AchievementObject>getBoutiquePatent(int size);
-
-List<AchievementObject>guessYouLike(int size);
+	public List<AchievementObject> recentAchievements(int size,String url,String showLocation);
+	
+	public List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
+	
+	public List<AchievementObject>getPatentList(int size,String url,String showLocation);
+	
+	public List<AchievementObject>getPracticalTechnologys(int size,String url,String showLocation);
+	
+	List<PolicyEntity> getIntellectualProperty(int size);
+	
+	AchievementObject getAchievementDetail(String id,Integer type);
+	
+	List<AchievementObject>getBoutiquePatent(int size);
+	
+	List<AchievementObject>guessYouLike(int size);
 
 }

+ 6 - 225
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.achievement.bo.AchievementImportBo;
@@ -55,8 +54,6 @@ import com.goafanti.common.model.AchievementDemandCount;
 import com.goafanti.common.model.AchievementKeyword;
 import com.goafanti.common.model.AchievementPublish;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Demand;
-import com.goafanti.common.model.DemandPublish;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;
@@ -71,9 +68,6 @@ import com.goafanti.portal.bo.AchievementDetailBo;
 import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
-import com.goafanti.portal.bo.AchievementSearchListBo;
-import com.goafanti.portal.bo.BoutiqueListBo;
-import com.goafanti.portal.bo.InternationalListBo;
 
 @Service
 public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> implements AchievementService {
@@ -106,51 +100,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	AchievementPublishMapper	achievementPublishMapper;
 	private static final Logger				logger	= LoggerFactory.getLogger(AchievementServiceImpl.class);
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId,
-			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
-			Integer boutique, Integer hot) {
-		Map<String, Object> params = disposeParams(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,null, hot,null);
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
-			params.put("adminId", TokenManager.getAdminId());
-		}
-		
-		return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
-				"findUserOwnerAchievementCount",params,
-				pNo, pSize);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId,
-			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot,String recordPerson) {
-		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot,recordPerson);
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		
-		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
-				"findOrgOwnerAchievementCount",params,pNo, pSize);
-	}
 
 	@Override
 	public void saveAchievement(Achievement a, String[] keywords,List<String >webPages,List<String>appPages) {
@@ -269,16 +218,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, String name,
+	public Pagination<AchievementListBo> listMyAchievement(Integer auditStatus, String name,
 		Integer dataCategory,  String releaseDateStartDate,
 			String releaseDateEndDate, Integer pNo, Integer pSize) {
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
 		return (Pagination<AchievementListBo>) findPage("listMyAchievementByPage", "listMyAchievementCount",
 				disposeParams( TokenManager.getUserId(), auditStatus,   dataCategory,name,
 						releaseDateStartDate, releaseDateEndDate),
@@ -286,18 +228,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 	
 	
-	//sixParam
-	private Map<String, Object> disposeParams( String ownerId,Integer auditStatus,Integer dataCategory,
-			 String name, 
-			String releaseDateStartDate, String releaseDateEndDate
-		) {
+	private Map<String, Object> disposeParams( String ownerId,Integer auditStatus,Integer dataCategory,String name, 
+			String releaseDateStartDate, String releaseDateEndDate) {
 		Map<String, Object> params = new HashMap<>();
-
 		Date rStart = null;
 		Date rEnd = null;
-		Date cStart = null;
-		Date cEnd = null;
-	
 
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
@@ -316,8 +251,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			} catch (ParseException e) {
 			}
 		}
-		
-
+	
 		if (!StringUtils.isBlank(ownerId)) {
 			params.put("ownerId", ownerId);
 		}
@@ -327,22 +261,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 		if (null != rEnd) {
 			params.put("rEnd", rEnd);
-		}
-		
+		}		
 
 		if (null != auditStatus) {
 			params.put("auditStatus", auditStatus);
-		}
-
-		
+		}	
 		if (!StringUtils.isBlank(name)) {
 			params.put("name", name);
 		}
-
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
-			params.put("techBrokerId", TokenManager.getAdminId());
-		}
-		
 		return params;
 	}
 
@@ -605,64 +531,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		achievementKeywordMapper.insertBatch(AchievementKeywordList);
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<AchievementSearchListBo> listAchievementSearchList(String url,String keyword, Integer dataCategory,
-			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
-			String upperPrice, String lowerPrice,Integer internationalFlag) {
-		Map<String, Object> params = new HashMap<>();
-		if (!StringUtils.isBlank(url)) {
-			params.put("url", url);
-		}
-		if (!StringUtils.isBlank(keyword)) {
-			params.put("keyword", keyword);
-		}
-
-		if (null != dataCategory) {
-			params.put("dataCategory", dataCategory);
-		}
-
-		if (null != category) {
-			params.put("category", category);
-		}
-		if (null != fieldA) {
-			params.put("fieldA", fieldA);
-		}
-
-		if (!StringUtils.isBlank(transferMode)) {
-			params.put("transferMode", transferMode);
-		}
-		if (dateSort != null) {
-			params.put("dateSort", dateSort);
-		}
-		if (upperPrice != null) {
-			params.put("upperPrice", upperPrice);
-		}
-		if (lowerPrice != null) {
-			params.put("lowerPrice", lowerPrice);
-		}
-		if (null !=internationalFlag ) {
-			params.put("internationalFlag", internationalFlag);
-		}
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 20) {
-			pSize = 20;
-		}
-		Pagination<AchievementSearchListBo> result = (Pagination<AchievementSearchListBo>) findPage(
-				"findSearchAchievementListByPage", "findSearchAchievementCount", params, pNo, pSize);
-		List<AchievementSearchListBo> AchievementSearchList = (List<AchievementSearchListBo>) result.getList();
-		for (int i = 0; i < AchievementSearchList.size(); i++) {
-			String introduction = AchievementSearchList.get(i).getIntroduction();
-			if (introduction != null)
-				introduction = introduction.length() > 20 ? introduction.substring(0, 20) + "... ..." : introduction;
-
-		}
-		return result;
-	}
-
 	@Override
 	public AchievementDetailBo selectAchievementSearchDetail(String uid, String id) {
 		return achievementMapper.selectAchievementSearchDetail(uid, id);
@@ -805,12 +673,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.updateByPrimaryKey(a);
 	}
 
-	@Override
-	@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
-	public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
-		return achievementMapper.selectInternationalAchievement();
-	}
-
 	@CacheEvict(value = "internationalAchievementList", allEntries = true)
 	public void cleanInternationalAchievement() {
 		LoggerUtils.debug(logger, "清除国际化技术列表");
@@ -821,37 +683,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.selectByPrimaryKey(id);
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<BoutiqueListBo> boutiqueSearchList(Integer dataCategory, Integer category, Integer fieldA,
-			Integer pNo, Integer pSize) {
-		Map<String, Object> params = new HashMap<>();
-		if (null != dataCategory) {
-			params.put("dataCategory", dataCategory);
-		}
-		if (null != category) {
-			params.put("category", category);
-		}
-		if (null != fieldA) {
-			params.put("fieldA", fieldA);
-		}
-		return (Pagination<BoutiqueListBo>) findPage("findBoutiqueListByPage", "findBoutiqueCount", params, pNo, pSize);
-	}
-
-	@Override
-	public List<AchievementListBo> getAchievement(Integer boutique) {
-		return achievementMapper.listAchievement();
-	}
-
-	@Override
-	public List<AchievementListBo> getPerhapLike() {
-		return achievementMapper.selectCsutomerLike(); //查询出猜你喜欢
-	}
-
-	@Override
-	public List<AchievementPartnerListBo> findPartnerAchievementList(String uid) {
-		return achievementMapper.findPartnerAchievementListByPage(uid);
-	}
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -896,56 +727,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return (Pagination<AchievementPartnerListBo>) findPage("findMyAchievementListByPage", "findMyAchievementCount",
 				params,pNo, pSize);
 	}
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<AchievementListBo> listMyAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId,
-			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot) {
-		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot,null);
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		
-		if (null != techBrokerId) {
-			params.put("techBrokerId", techBrokerId);
-		}
-		
-		return (Pagination<AchievementListBo>) findPage("findMyyAchievementListByPage",
-				"findMyyAchievementCount",params,pNo, pSize);
-	}
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<AchievementListBo> listManageAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId,
-			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot,String recordPerson) {
-		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot,recordPerson);
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		
-		if (null != techBrokerId) {
-			params.put("techBrokerId", techBrokerId);
-		}
-		
-		return (Pagination<AchievementListBo>) findPage("findManageAchievementListByPage",
-				"findManageAchievementCount",params,pNo, pSize);
-	}
 
 	@Override
 	public int saveAppAchievement(Achievement a, String[] keywords) {

+ 0 - 9
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -4,23 +4,18 @@ import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.Min;
 
-import org.apache.commons.fileupload.util.LimitedInputStream;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.fieldGlossoryBo;
-import com.goafanti.common.constant.PageConstants;
 import com.goafanti.common.model.Banners;
-import com.goafanti.common.model.Demand;
 import com.goafanti.common.utils.LimitLengthUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -225,16 +220,12 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-
-
 	@RequestMapping(value = "/portal/membership", method = RequestMethod.GET)
 	public ModelAndView membership(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/membership");
 		return modelview;
 	}
 
-
-
 	@RequestMapping(value = "/portal/search/subscriberUser", method = RequestMethod.GET)
 	public ModelAndView portalSearchSubscriberUser(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/search/subscriberUser");

+ 4 - 657
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -609,318 +609,7 @@
       boutique = #{boutique,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  
-  <select id="findUserOwnerAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	select 
-  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-  		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		ui.username as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique,a.create_time as createTime
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		,1 as hot
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		,0 as hot
-	</if>
-	<if test="hot==null"><!-- 无首页参数 -->
-		,ifnull(mm.effective,0) as hot
-	</if>
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-  	LEFT JOIN user_identity ui on a.owner_id = ui.uid
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 and a.owner_type = 0
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
-  		and  (a.owner_id is null or a.owner_id = '')
-  	</if>
-  	<if test="username != null">
-  		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and mm.effective = 1
-	</if>
-	order by a.serial_number desc
-	<if test="page_sql!=null">
-			${page_sql}
-	</if>
-  </select>
-  
-  <select id="findUserOwnerAchievementCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement a
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where deleted_sign = 0 and owner_type = 0
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
-  		and  (a.owner_id is null or a.owner_id = '')
-  	</if>
-  	<if test="username != null">
-  		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="ownerId != null">
-		and  owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot = 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot = 1"><!-- 在首页 -->
-		and mm.effective = 1
-	</if>
-  </select>
-  
-  
-  
-  <select id="findOrgOwnerAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	select 
-  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-  		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		a.owner_id as ownerId, a.org_id as orgId,a.create_time as createTime,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique,ad.id techBrokerIdd,
-  		a.release_status as releaseStatus
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		,1 as hot
-	</if>
-	<if test="hot != null and hot == 0"><!-- 无首页参数 -->
-		,0 as hot
-	</if>
-	<if test="hot==null"><!-- 在首页 -->
-		,ifnull(mm.effective,0) as hot
-	</if>
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-  	<if test="hot != null and hot == 1"> <!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 
-  	<if test="recordPerson != null">
-		and ad.name = #{recordPerson,jdbcType=VARCHAR}
-	</if>
-  	<if test="ownerType != null">
-		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
-	</if>
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT(#{ownerName,jdbcType=VARCHAR},'%') 	
-  	</if>
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and mm.effective = 1
-	</if>
-	order by serial_number desc
-	<if test="page_sql!=null">
-			${page_sql}
-	</if>
-  </select>
-  
-  <select id="findOrgOwnerAchievementCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 
-  	<if test="recordPerson != null">
-		and ad.name = #{recordPerson,jdbcType=VARCHAR}
-	</if>
-  	<if test="ownerType != null">
-		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
-	</if>
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and  mm.effective = 1
-	</if>
-  </select>
-  
-  
+
   <update id="updateReleaseDate" parameterType="java.lang.String">
   	update achievement set release_date = null
   	where id = #{id,jdbcType=VARCHAR}
@@ -1602,9 +1291,8 @@
 	where uid=#{uid,jdbcType=VARCHAR}
   	</select>
   	
-  	 <select id="findMyAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	  
-  select 
+  <select id="findMyAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  	select 
 	  a.id, a.boutique,a.name,a.category, a.audit_status as auditStatus,ifnull(t.x,0) as buyIntention,
 	  a.release_date as releaseDate,a.create_time as createTime,ifnull(i.y,0) as countInterest
 	from  achievement a 
@@ -1632,349 +1320,8 @@
 	<if test="ownerId != null">
   	and  a.owner_id  = #{ownerId,jdbcType=VARCHAR}
   	</if>
-  	</select>
-  	
-  	<select id="findMyyAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	select 
-  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-  		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		<!-- oi.unit_name as username,  -->a.owner_id as ownerId, a.org_id as orgId,a.create_time as createTime,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		,1 as hot
-	</if>
-	<if test="hot != null and hot == 0"><!-- 无首页参数 -->
-		,0 as hot
-	</if>
-	<if test="hot==null"><!-- 在首页 -->
-		,ifnull(mm.effective,0) as hot
-	</if>
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
-	<if test="adminId != null">
-		LEFT JOIN user u on a.owner_id = u.id
-	</if>
-  	<if test="hot != null and hot == 1"> <!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 
-  	<if test="ownerType != null">
-		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
-	</if>
-  	<if test="techBrokerId != null">
-		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} 
-	</if>
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%') 	
-  	</if>
-  	<!-- <if test="unitName != null">
-  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if> -->
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and mm.effective = 1
-	</if>
-	order by serial_number desc
-	<if test="page_sql!=null">
-			${page_sql}
-	</if>
-  </select>
-  
-  <select id="findMyyAchievementCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
-	<if test="adminId != null">
-		LEFT JOIN user u on a.owner_id = u.id
-	</if>
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 
-  	<if test="ownerType != null">
-		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
-	</if>
-  	<if test="techBrokerId != null">
-		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} 
-	</if>
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT(#{ownerName,jdbcType=VARCHAR},'%')
-  	</if>
-  	<!-- <if test="unitName != null">
-  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if> -->
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and  mm.effective = 1
-	</if>
-  </select>
-  	
-  	<select id="findManageAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	select 
-  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-  		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		<!-- oi.unit_name as username,  -->a.owner_id as ownerId, a.org_id as orgId,a.create_time as createTime,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		,1 as hot
-	</if>
-	<if test="hot != null and hot == 0"><!-- 无首页参数 -->
-		,0 as hot
-	</if>
-	<if test="hot==null"><!-- 在首页 -->
-		,ifnull(mm.effective,0) as hot
-	</if>
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-  	LEFT JOIN department_management dm on dm.id = ad.department_id
-	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
-	<if test="adminId != null">
-		LEFT JOIN user u on a.owner_id = u.id
-	</if>
-  	<if test="hot != null and hot == 1"> <!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 
-  	<if test="recordPerson != null">
-		and ad.name = #{recordPerson,jdbcType=VARCHAR}
-	</if>
-  	<if test="ownerType != null">
-		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
-	</if>
-  	<if test="techBrokerId != null">
-		and (a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} or ad.department_id=(select department_id from admin where id=#{techBrokerId,jdbcType=VARCHAR}))
-	</if>
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT(#{ownerName,jdbcType=VARCHAR},'%') 	
-  	</if>
-  	<!-- <if test="unitName != null">
-  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if> -->
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and mm.effective = 1
-	</if>
-	order by serial_number desc
-	<if test="page_sql!=null">
-			${page_sql}
-	</if>
-  </select>
-  
-  <select id="findManageAchievementCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement a
-  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-  	LEFT JOIN department_management dm on dm.id = ad.department_id
-	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
-	<if test="adminId != null">
-		LEFT JOIN user u on a.owner_id = u.id
-	</if>
-  	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		inner join marketing_management mm on a.id = mm.product_id
-	</if>
-	<if test="hot == null"> <!-- 无首页参数 -->
-		left join marketing_management mm on a.id = mm.product_id 
-	</if>
-  	where a.deleted_sign = 0 
-  	<if test="recordPerson != null">
-		and ad.name = #{recordPerson,jdbcType=VARCHAR}
-	</if>
-  	<if test="ownerType != null">
-		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
-	</if>
-  	<if test="techBrokerId != null">
-		and (a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} or ad.department_id=(select department_id from admin where id=#{techBrokerId,jdbcType=VARCHAR}))
-	</if>
-  	<if test="ownerName != null">
-  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
-  	</if>
-  	<!-- <if test="unitName != null">
-  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if> -->
-  	<if test="ownerId != null">
-		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
-	</if>
-  	<if test="serialNumber != null">
-		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
-	</if>
-	<if test="auditStatus != null">
-		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
-	</if>
-	<if test="name != null">
-		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-	</if>
-	<if test="keyword != null">
-		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-	</if>
-	<if test="category != null">
-		and  a.category = #{category,jdbcType=INTEGER}
-	</if>
-	<if test="status != null">
-		and  a.status = #{status,jdbcType=INTEGER}
-	</if>
-	<if test="rStart != null">
-       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="rEnd != null">
-	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cStart != null">
-       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test="cEnd != null">
-	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="releaseStatus != null">
-	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
-	</if>
-	<if test="boutique != null">
-		and a.boutique = #{boutique,jdbcType=INTEGER}
-	</if>
-	<if test="hot != null and hot == 0"><!-- 不在首页 -->
-		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
-	</if>
-	<if test="hot != null and hot == 1"><!-- 在首页 -->
-		and  mm.effective = 1
-	</if>
   </select>
+
   <select id="getAppHomeAchievement" resultType="com.goafanti.app.bo.HomeAchievemend">
   select ap.achievement_id as id ,a.name as name ,a.technical_picture_url as img, 
 		ap.if_top,ap.top_number,ap.show_number