--no commit message

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

@@ -25,7 +25,7 @@ public interface EbookMainBodyMapper extends BaseMapper<EbookMainBody>{
 			+ " AND bb.status = #{status} "
 			+ "</if>"
 			+ "<if test='"+ NOTBLANK +"(nai)'>"
-			+ " AND (bb.name like concat('%',#{nai},'%')  OR bb.issnNumber like concat('%',#{nai},'%') OR bb.cnNumber like concat('%',#{nai},'%')) "
+			+ " AND (bb.name like concat('%',#{nai},'%')  or bb.issnNumber like concat('%',#{nai},'%') or bb.cnNumber like concat('%',#{nai},'%')) "
 			+ "</if>"
 		    + " order by bb.uploadTime desc "
 			+ "</script>")

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

@@ -11,12 +11,12 @@ import com.zrqx.core.vo.resource.fg.ebook.FgEbookMainBodyVO;
 public interface EbookMainBodyRelationMapper extends BaseMapper<EbookMainBodyRelation> {
 
 	@Select("<script>" 
-			+ "select id,yearId,year as name from res_ebook_main_body_relation where 1=1 and mainBodyId = #{oid} GROUP BY year ORDER BY year desc"
+			+ "select id,yearId,year as name from res_ebook_main_body_relation where 1=1 and mainBodyId = #{oid} group by year group by year desc"
 		    + "</script>")
 	List<FgEbookMainBodyVO> queryByUploadAsc(String oid);
 	
 	@Select("<script>" 
-			+ "select r.id,r.yearId,r.year as name from res_ebook_main_body_relation r join res_book b on r.objectId = b.id where b.status=1 and r.mainBodyId = #{oid} GROUP BY r.year ORDER BY r.year desc"
+			+ "select r.id,r.yearId,r.year as name from res_ebook_main_body_relation r join res_book b on r.objectId = b.id where b.status=1 and r.mainBodyId = #{oid} group by r.year order by r.year desc"
 		    + "</script>")
 	List<FgEbookMainBodyVO> fgqueryByUploadAsc(String oid);
 }

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

@@ -28,8 +28,8 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 	 */
 	@Select("<script>"
 			+ "SELECT "
-			+ " DISTINCT bb.id,bb.name,bb.bookSeries,bb.JournalCode,bb.year,bb.periods,bb.status,bb.mainBody,"
-			+ " bb.download,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d %H:%i:%s')uploadTime,DATE_FORMAT(bb.releaseTime,'%Y-%m-%d')releaseTime"
+			+ " distinct bb.id,bb.name,bb.bookSeries,bb.JournalCode,bb.year,bb.periods,bb.status,bb.mainBody,"
+			+ " bb.download, date_format(bb.uploadTime,'%Y-%m-%d %H:%i:%s')uploadTime,DATE_FORMAT(bb.releaseTime,'%Y-%m-%d')releaseTime"
 			+ " FROM res_book bb where 1=1 "  
 			+ "<if test='status!=null'>"
 			+ " AND bb.status = #{status} "
@@ -38,7 +38,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			+ "and bb.mainBodyId = #{mainBody} "
 			+ "</if>" 
 			+ "<if test='"+ NOTBLANK +"(nai)'>"
-			+ " AND (bb.name like concat('%',#{nai},'%')  OR bb.executiveEditor like concat('%',#{nai},'%') OR bb.JournalCode like concat('%',#{nai},'%')) "
+			+ " AND (bb.name like concat('%',#{nai},'%')  or bb.executiveEditor like concat('%',#{nai},'%') OR bb.JournalCode like concat('%',#{nai},'%')) "
 			+ "</if>"
 		    + " order by bb.uploadTime desc "
 			+ "</script>")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -107,7 +107,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 						book.setYear(year.getName());
 					}else if(i==3) {
 						book.setPeriodsId(str);
-						book.setPeriods(str);
+						book.setPeriods(Integer.getInteger(str));
 					}
 				}
 			}
@@ -154,7 +154,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 						book.setYear(year.getName());
 					}else if(i==3) {
 						book.setPeriodsId(str);
-						book.setPeriods(str);
+						book.setPeriods(Integer.getInteger(str));
 					}
 				}
 			}