--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java

@@ -29,45 +29,15 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 	 */
 	@Select("<script>"
 			+ "SELECT "
-			+ " bb.id,bb.name,bb.author,bb.isbn,bb.copyrightTerm,bb.copyrightTermBegin, "
-			+ " be.realprice,be.entityRealPrice,be.uploadTime,be.updateTime,be.bookStatus "
-			+ " FROM res_book bb "  
-	        + " LEFT JOIN res_ebook be ON bb.id = be.id "  
-	        + " LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookid"
+			+ " bb.id,bb.name,bb.author,bb.isbn,bb.price, bb.uploadTime,bb.bookStatus "
+			+ " FROM res_book bb  LEFT JOIN res_ebook_diy_type bdt ON bb.id = bdt.ebookid"
 	        + " WHERE 1 = 1 " 
-			+ "<if test='option==1'>"
-			+ " AND bb.author is null "
-			+ "</if>"
-			+ "<if test='option==2'>"
-			+ " AND be.bookCover is null "
-			+ "</if>"
-			+ "<if test='option==3'>"
-			+ " AND be.summary is null "
-			+ "</if>"
-			+ "<if test='option==4'>"
-			+ " AND be.realPrice is null "
-			+ "</if>"
 			+ "<if test='bookStatus!=null'>"
-			+ " AND be.bookStatus = #{bookStatus} "
-			+ "</if>"
-			+ "<if test='bookStatus==null'>"
-			+ " AND be.bookStatus != 6 "
-			+ "</if>"
-			+ "<if test='type!=null'>"
-			+ " AND bb.type = #{type} "
-			+ "</if>"
-			+ "<if test='bookType!=null'>"
-			+ " AND be.bookType = #{bookType} "
-			+ "</if>"
-			+ "<if test='status!=null'>"
-			+ " AND bb.status = #{status} "
+			+ " AND bb.bookStatus = #{bookStatus} "
 			+ "</if>"
 	        + "<if test='"+ NOTBLANK +"(diyTypeCode)' >"  
 			+ "and bdt.code like concat(#{diyTypeCode},'%') "
 			+ "</if>" 
-			+ "<if test='"+ NOTBLANK +"(nai)'>"
-			+ " AND (bb.name like concat('%',#{nai},'%')  OR bb.author like concat('%',#{nai},'%') OR bb.isbn like concat('%',#{nai},'%')) "
-			+ "</if>"
 			+ "<if test='"+ NOTBLANK +"(name)'>"
 			+ " AND bb.name like concat('%',#{name},'%')"
 			+ "</if>"
@@ -78,12 +48,12 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			+ " AND bb.isbn like concat('%',#{isbn},'%')"
 			+ "</if>"
 			+ "<if test='"+ NOTBLANK +"(beginTime)'>"
-			+ " AND be.uploadTime &gt;= concat(#{beginTime}, ' 00:00:00')"
+			+ " AND bb.uploadTime &gt;= concat(#{beginTime}, ' 00:00:00')"
 			+ "</if>"
 			+ "<if test='beginTime!=null and endTime!=null'>"
-			+ " AND be.uploadTime &lt;= concat(#{endTime}, ' 23:59:59')"
+			+ " AND bb.uploadTime &lt;= concat(#{endTime}, ' 23:59:59')"
 			+ "</if>"
-		    + " order by be.uploadTime desc "
+		    + " order by bb.uploadTime desc "
 			+ "</script>")
 	List<EbookListVO> page(QueryEbookInfoForm form);
 	@Select("<script>"