@我的列表移动端过滤掉案例和笔记

servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java

@@ -169,6 +169,47 @@ public class CommentsApi extends ApiBaseController{
 			return error("查询@我的数据失败",e.getMessage());
 		}
 	}
+
+	/**
+	 * 查询@我的
+	 * @param pager
+	 * @param type 类型，课程 ，文章，问题
+	 * @param send
+	 * @param isread 是否已读，对应已回答的
+	 * @return
+	 */
+	@RequestMapping(value="/tome/mobilepage",method= {RequestMethod.GET,RequestMethod.POST})
+	public JsonResponse<PageList<CommentsDto>> tomeMobilePage(Pagination pager,String send,Boolean isread){
+		String aid=getCurrent().getAccountId();
+		PageList<CommentsDto> all = service.findMobileAll(pager.getPageIndex(), pager.getPageSize(), aid, send);
+		return success(all);
+//		try {
+//			if(type==1) {
+//				PageList<CommentsDto> list=service.findCourseTome(pager.getPageIndex(),pager.getPageSize(), type, aid, send,isread);
+//				//查询二级回复内容
+//				return success(list);
+//			}
+//			if(type==2){
+//				PageList<CommentsDto> list=service.findArticleTome(pager.getPageIndex(),pager.getPageSize(), type, aid, send,isread);
+//				//查询二级回复内容
+//				return success(list);
+//			}
+//			if(type==3){
+//				PageList<CommentsDto> casesTome = service.findCasesTome(pager.getPageIndex(), pager.getPageSize(), type, aid, send, isread);
+//				return success(casesTome);
+//			}
+//			if(type==4){
+//				PageList<CommentsDto> list = service.findQaTome(pager.getPageIndex(), pager.getPageSize(), type, aid, send, isread);
+//				return success(list);
+//			}
+//			else {
+//				return success(new PageList<CommentsDto>());
+//			}
+//		}catch(Exception e) {
+//			return error("查询@我的数据失败",e.getMessage());
+//		}
+	}
+
 	
 	@PostMapping("/add")
 	@AutoLog(module = "评论",action = "添加评论",info = "添加评论内容")

servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java

@@ -136,6 +136,12 @@ public interface ICommentsService {
 	 * */
 	PageList<CommentsDto> findAll(int pageIndex, int pageSize, String toaid, String uname);
 
+	/**
+	 * 查询@我的全部 去掉案例和笔记
+	 * 问答和其他三个结构不一样
+	 * */
+	PageList<CommentsDto> findMobileAll(int pageIndex, int pageSize, String toaid, String uname);
+
 
 	/**
 	 *

servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java

@@ -296,6 +296,87 @@ public class CommentsServiceImpl implements ICommentsService{
 
 	}
 
+	@Override
+	public PageList<CommentsDto> findMobileAll(int pageIndex, int pageSize, String toaid, String uname) {
+		PageList<CommentsDto> list = new PageList<>();
+		list.setList(new ArrayList<CommentsDto>());
+		QueryBuilder builder = QueryBuilder.from(CommentQa.class);
+//		builder.addFilter(FieldFilters.eq("deleted",false));
+//		builder.addFilter(FieldFilters.ne("objType",4));
+		if(StringUtil.isNotBlank(toaid)){
+			builder.addFilter(FieldFilters.eq("toAid",toaid));
+		}
+
+		if(StringUtil.isNotBlank(uname)){
+			builder.addFilter(FieldFilters.eq("sysCreateBy",uname));
+		}
+		builder.addOrder(OrderCondition.desc("sysCreateTime"));
+		builder.setPageIndex(pageIndex);
+		builder.setPageSize(pageSize);
+		//查出所有@我的数据
+		PageList<CommentQa> page = commentQaDao.findPage(builder.builder());
+		//问答
+		List<String> qaStrings = new ArrayList<>();
+		//文章
+		List<String> articleStrings = new ArrayList<>();
+		for (CommentQa c:page.getList()) {
+
+			CommentsDto commentsDto = new CommentsDto();
+			commentsDto.setCommentId(c.getId());
+			commentsDto.setObjId(c.getRefId());
+			commentsDto.setObjType(c.getRefType());
+			commentsDto.setToAid(c.getToAid());
+			commentsDto.setToAname(c.getToName());
+			commentsDto.setContent(c.getContent());
+			commentsDto.setSysCreateAid(c.getSysCreateAid());
+			commentsDto.setSysCreateBy(c.getSysCreateBy());
+			commentsDto.setSysCreateTime(c.getSysCreateTime());
+			list.getList().add(commentsDto);
+
+			if(c.getRefType()==4){
+				qaStrings.add(c.getRefId());
+			}
+			if(c.getRefType()==2){
+				articleStrings.add(c.getRefId());
+			}
+		}
+		if(qaStrings!=null && !qaStrings.isEmpty()){
+			QueryBuilder builder1 = QueryBuilder.from(Question.class);
+			builder1.addFilter(FieldFilters.in("id",qaStrings));
+			builder1.addFields("new Question(id,title)");
+			List<Question> qaList = questionDao.findList(builder1.builder());
+
+			if(qaList!=null && !qaList.isEmpty()){
+				for (Question q:qaList) {
+					for (CommentsDto c:list.getList()) {
+						if(q.getId().equals(c.getObjId())){
+							c.setTitle(q.getTitle());
+						}
+					}
+				}
+			}
+		}
+
+		if(articleStrings!=null && !articleStrings.isEmpty()){
+			QueryBuilder builder1 = QueryBuilder.from(Article.class);
+			builder1.addFilter(FieldFilters.in("id",articleStrings));
+			builder1.addFields("new Article(id,title)");
+			List<Article> articleList = articleDao.findList(builder1.builder());
+			if(articleList!=null && !articleList.isEmpty()){
+				for (Article a:articleList) {
+					for (CommentsDto c:list.getList()) {
+						if(a.getId().equals(c.getObjId())){
+							c.setTitle(a.getTitle());
+						}
+					}
+				}
+			}
+		}
+		list.setCount(page.getCount());
+		list.setPageSize(pageSize);
+		return list;
+	}
+
 	@Override
 	public List<Comments> list(Integer objType, String objId) {
 		List<Comments> list = dao.findList(FieldFilters.eq("objType", objType), FieldFilters.eq("objId", objId));