--no commit message

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

 package com.zrqx.resource.bg.mapper.ebook;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Select;
+
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.EbookMainBodyRelation;
 
 public interface EbookMainBodyRelationMapper extends BaseMapper<EbookMainBodyRelation> {
+
+	@Select("<script>" 
+			+ "select * from res_ebook_main_body_relation where 1=1 and mainBodyId = #{oid} GROUP BY year "
+		    + "</script>")
+	List<EbookMainBodyRelation> queryByUploadAsc(String oid);
 }

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

 package com.zrqx.resource.bg.service.ebook;
 
+import java.util.List;
+
 import com.zrqx.core.model.resource.ebook.EbookMainBodyRelation;
 import com.zrqx.core.service.BaseService;
 
+import tk.mybatis.mapper.entity.Example;
+
 public interface EbookMainBodyRelationService extends BaseService<EbookMainBodyRelation, String> {
+
+	List<EbookMainBodyRelation> queryByUploadAsc(String oid);
 }

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

 package com.zrqx.resource.bg.service.ebook;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -7,6 +9,8 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.EbookMainBodyRelation;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyRelationMapper;
+
+import tk.mybatis.mapper.entity.Example;
 @Service
 public class EbookMainBodyRelationServiceImpl extends BaseServiceImpl<EbookMainBodyRelation, String> implements EbookMainBodyRelationService{
 	@Autowired
@@ -16,6 +20,12 @@ public class EbookMainBodyRelationServiceImpl extends BaseServiceImpl<EbookMainB
 	public BaseMapper<EbookMainBodyRelation> getMapper() {
 		return ebookMainBodyRelationMapper;
 	}
+
+	@Override
+	public List<EbookMainBodyRelation> queryByUploadAsc(String oid) {
+		// TODO Auto-generated method stub
+		return ebookMainBodyRelationMapper.queryByUploadAsc(oid);
+	}
 	
 	
 

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookMainBodyController.java

 package com.zrqx.resource.fg.controller.ebook;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -50,19 +51,8 @@ public class FgEbookMainBodyController {
 	}
 	@ApiOperation("查询杂志主体下年份")
 	@GetMapping(ResourceRequestPath.YEAR)
-	public CallBack<FgEbookMainBodyVO> getBookMainBodYear(String oid) {
-		List<YearLibrary> list = new ArrayList<YearLibrary>();
-		FgEbookMainBodyVO vo = new FgEbookMainBodyVO();
-		Example example = ebookMainBodyRelationService.createExample();
-		example.and().andEqualTo("mainBodyId",oid);
-		List<EbookMainBodyRelation> ebookList = ebookMainBodyRelationService.selectByExample(example);
-			for (EbookMainBodyRelation ebookMainBodyRelation : ebookList) {
-				YearLibrary library = yearLibraryService.queryByUploadAsc(ebookMainBodyRelation.getYearId()).get(0);
-				list.add(library);
-			}	
-			Set set = new HashSet(list);
-	        List tempList = new ArrayList(set);
-			vo.setYear(list);
-		return CallBack.success(vo);
+	public CallBack<List<EbookMainBodyRelation>> getBookMainBodYear(String oid) {
+		List<EbookMainBodyRelation> ebookList = ebookMainBodyRelationService.queryByUploadAsc(oid);
+		return CallBack.success(ebookList);
 	}
 }