--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -743,4 +743,40 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		return vo;
 	}
 	
+	@Override
+	public List<FgArticleLibraryListVO> queryRecommendArticle(FgQueryRecommedArticleForm form) {
+		// 查询从推荐位传的id集合，查询文章信息
+		List<FgArticleLibraryListVO> list = new ArrayList<FgArticleLibraryListVO>();
+		if(ArrayUtils.isNotEmpty(form.getIds())){
+			list = mapper.queryRecommendArticle(form);	
+		}
+		// 判断数量是否满足，不满足，需要补全
+		if(list.size() < form.getNum()){
+			int num = form.getNum() - list.size();
+			PageHelper.startPage(1, num, "uploadTime desc ,a.id desc");
+			List<FgArticleLibraryListVO> lis = mapper.queryOtherRecommendArticle(form);
+			list.addAll(lis);
+		}
+		this.isPdf(list);
+		this.regEx(list);
+		return list;
+	}
+	/**
+	 * 是否是pdf
+	 * @param objectList
+	 * @author ycw
+	 * @date: 2019年4月15日 下午5:07:37
+	 */
+	private void isPdf(List<FgArticleLibraryListVO> objectList){
+		if(ArrayUtils.isNotEmpty(objectList)){
+			objectList.forEach(obj -> {
+				ArticleLibrary ar = mapper.selectByPrimaryKey(obj.getId());
+				if(ar != null && StringUtils.isNotBlank(ar.getPdf())){
+					obj.setIsPdf(Integer.parseInt(BooleanStatusEnum.YES.getCode()));
+				}else{
+					obj.setIsPdf(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
+				}
+			});
+		}
+	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibraryService.java

@@ -108,4 +108,13 @@ public interface FgArticleLibraryService extends BaseService<ArticleLibrary,Stri
 	 * @date: 2019年5月31日 下午2:27:31
 	 */
 	FgArticleLibraryOneVO getInfoBysolrDocument(SolrDocument solrDocument);
+	
+	/**
+	 * 获取最新数据补全推荐位
+	 * @param form
+	 * @return
+	 * @author ycw
+	 * @date: 2019年1月18日 下午1:50:44
+	 */
+	List<FgArticleLibraryListVO> queryRecommendArticle(FgQueryRecommedArticleForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookService.java

@@ -126,4 +126,12 @@ public interface FgEbookService extends BaseService<Ebook, String>{
 	 * @date: 2019年5月31日 上午10:33:58
 	 */
 	FgEbookVO getInfoBysolrDocument(SolrDocument solrDocument);
+	
+	 /* 前台医著推荐
+	 * @param form
+	 * @return
+	 * @author ycw
+	 * @date: 2018年11月20日 下午2:39:32
+	 */
+	List<FgEbookListVO> getRecommendList(FgQueryRecommedEbookForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java

@@ -605,4 +605,22 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 		}
 		return null;
 	}
+	
+	@Override
+	public List<FgEbookListVO> getRecommendList(FgQueryRecommedEbookForm form) {
+		List<FgEbookListVO> list = new ArrayList<FgEbookListVO>();
+		//查询从推荐位传的id集合，查询医著信息
+		if(form.getIds() != null){
+			list = ebookMapper.queryRecommendEbook(form);
+		}
+		//判断数量是否满足，不满足，需要补全
+		if(list.size() < form.getNum()){
+			int num = form.getNum() - list.size();
+			PageHelper.startPage(0, num, "uploadTime desc");
+			List<FgEbookListVO> lis = ebookMapper.getOtherRecommendList(form);
+			list.addAll(lis);
+		}
+		this.regEx(list);
+		return list;
+	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/membercollection/FgMemberCollectionServiceImpl.java

@@ -67,7 +67,7 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 			record.setMemberId(memberId);
 			record.setObjectId(String.valueOf(gf.getId()));
 			record.setObjectType(gf.getType());
-			record.setMemberType(form.getMemberType());
+			record.setMemberType(member.getLevel().toString());
 			
 			mc = selectOne(record);