--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/note/FgNoteMapper.java

@@ -2,26 +2,84 @@ package com.zrqx.resource.fg.mapper.note;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import com.zrqx.core.form.resource.fg.note.FgQueryNoteListForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.note.Note;
-import com.zrqx.core.model.resource.record.Record;
 import com.zrqx.core.vo.resource.fg.note.ExcelNoteExportVo;
 
 /**
- * 浏览记录
- * @author ycw
- * @date 2019年2月12日下午2:42:01
+ * 用户笔记
+ * @author ydm
+ *
  */
+@Mapper
 public interface FgNoteMapper extends BaseMapper<Note> {
 
+	@Select("<script>"
+			+ "select * from res_note where 1=1 "
+			+ "<if test = '"+ NOTBLANK +"(form.bookId)' >"  
+			+ " and bookId = #{form.bookId} "
+			+ "</if>"
+			+ "<if test = '"+ NOTBLANK +"(form.articleId)' >"  
+			+ " and articleId = #{form.articleId} "
+			+ "</if>"
+			+ "<if test = '"+ NOTBLANK +"(form.markId)' >"  
+			+ " and markId = #{form.markId} "
+			+ "</if>"
+			+ " and creater = #{memberId} "
+			+ " order by createTime desc "
+			+ "</script>")
+	List<Note> listByMarkId(@Param("form")FgQueryNoteListForm form, @Param("memberId")Integer memberId);
+
+	/**
+	 * 我的笔记
+	 * @param form
+	 * @param id
+	 * @return
+	 */
+	@Select("<script>"
+			+ "select * from res_note where 1=1 "
+			+ "<if test = '"+ NOTBLANK +"(form.bookName)' >"  
+			+ " and bookName = #{form.bookName} "
+			+ "</if>"
+			+ " and creater = #{memberId} "
+			+ " order by createTime desc "
+			+ "</script>")
+	List<Note> listMyNote(@Param("form")FgQueryNoteListForm form, @Param("memberId")Integer memberId);
+
+	/**
+	 * 名称列表
+	 * @param bookName
+	 * @return
+	 */
+	@Select("<script>"
+			+ "select distinct bookName from res_note where 1=1 "
+			+ "<if test = '"+ NOTBLANK +"(bookName)' >"  
+			+ " and bookName like concat('%',#{bookName},'%') "
+			+ "</if>"
+			+ " and creater = #{memberId} "
+			+ " order by createTime desc "
+			+ "</script>")
+	List<String> listName(@Param("bookName")String bookName, @Param("memberId")Integer memberId);
+
 	/**
-	 * 导出笔记
+	 * 导出我的笔记
+	 * @param query
+	 * @param id
 	 * @return
 	 */
-	@Select("select * from res_note where memberid = #{member} order by createTime desc")
-	List<ExcelNoteExportVo> exportBook(Integer member);
+	@Select("<script>"
+			+ "select * from res_note where 1=1 "
+			+ "<if test = '"+ NOTBLANK +"(form.bookName)' >"  
+			+ " and bookName = #{form.bookName} "
+			+ "</if>"
+			+ " and creater = #{memberId} "
+			+ " order by createTime desc "
+			+ "</script>")
+	List<ExcelNoteExportVo> importNote(@Param("form")FgQueryNoteListForm form, @Param("memberId")Integer memberId);
+	
 }