--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/ebook/QueryEbookForm.java

@@ -27,7 +27,7 @@ public class QueryEbookForm {
 	@ApiModelProperty("数据来源  1:本版 2外版")
 	private Integer dataSources;
 	@ApiModelProperty("审核状态  0：录入中  1：待审核  2：审核中 3：审核通过  4：审核未通过")
-	private Integer bookStatus;
+	private Integer status;
 	@ApiModelProperty(value = "自定义分类id")
 	private List<String> diyTypeId;
 	@ApiModelProperty("自定义分类code")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/audiolibrary/AudioLibraryController.java

@@ -227,13 +227,6 @@ public class AudioLibraryController {
 		}
 		return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
 	}
-
-	@ApiOperation(value = "选择弹窗中的列表", notes = "查询选择弹窗中的列表")
-	@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
-	public CallBack<PageInfo<AudioLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam) {
-		return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
-	}
-
 	@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
 	@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
 	public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/coursewarelibrary/CoursewareLibraryController.java

@@ -216,13 +216,6 @@ public class CoursewareLibraryController {
 		}
 		return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
 	}
-
-	@ApiOperation(value = "选择弹窗中的列表", notes = "查询选择弹窗中的列表")
-	@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
-	public CallBack<PageInfo<CoursewareLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam) {
-		return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
-	}
-
 	@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
 	@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
 	public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java

@@ -401,34 +401,34 @@ public class EbookLibraryController {
 	public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam) {
 		 if(form.getResourceType().equals(1)){
 			return CallBack.success(ebookservice.pageByTitleAndDiyType(form, pageParam));
-		}else /*if(form.getResourceType().equals(2)){
+		}else if(form.getResourceType().equals(2)){
 			return CallBack.success(articleLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(3)){
-			return CallBack.success(patentLibraryService.pageByTitleAndDiyType(form, pageParam));
+			return CallBack.success(periodVolumeService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(4)){
 			return CallBack.success(patentLibraryService.pageByTitleAndDiyType(form, pageParam));
-		}else */if(form.getResourceType().equals(5)){
+		}else if(form.getResourceType().equals(5)){
 			return CallBack.success(imageLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(6)){
-			videoLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(videoLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(7)){
-			audioLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(audioLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(8)){
-			animationLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(animationLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(9)){
-			coursewareLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(coursewareLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(10)){
-			statuteLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(statuteLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(11)){
-			criterionLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(criterionLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(12)){
-			PatentLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(PatentLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(13)){
-			achievementLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(achievementLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(14)){
-			clauseLibraryService.pageByTitleAndDiyType(form, pageParam);
+			return CallBack.success(clauseLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}else if(form.getResourceType().equals(15)){
-			CallBack.success(pdfLibraryService.pageByTitleAndDiyType(form, pageParam));
+			return CallBack.success(pdfLibraryService.pageByTitleAndDiyType(form, pageParam));
 		}
 		return null ;
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/periodical/PeriodVolumeLibraryController.java

@@ -114,11 +114,6 @@ public class PeriodVolumeLibraryController {
 		BeanUtils.copyProperties(volume, vo);
 		return CallBack.success(vo);
 	}
-	@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
-	@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
-	public CallBack<PageInfo<PeriodVolumeListVO>> page(QueryResourceForPoPForm form, PageParam pageParam){
-		return CallBack.success(volumeService.pageByTitleAndDiyType(form, pageParam));
-	}
 	@ApiOperation("相关资源列表")
 	@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.PAGE)
 	public CallBack<PageInfo<ResourceRelationVo>> reousrceRelationPage(QueryResourceRelationForm entity,

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/animationlibrary/AnimationLibraryMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.animation.QueryAnimationLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.animationlibrary.AnimationLibrary;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.animationlibrary.AnimationLibraryListVO;
 /**
  * 音频库
@@ -58,5 +59,5 @@ public interface AnimationLibraryMapper extends BaseMapper<AnimationLibrary> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<AnimationLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 /**
  * 文章库
@@ -68,5 +69,5 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<ArticleLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.audiolibrary.QueryAudioLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryListVO;
 /**
  * 音频库
@@ -58,5 +59,5 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<AudioLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/coursewarelibrary/CoursewareLibraryMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.coursewarelibrary.QueryCoursewareLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibrary;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.coursewarelibrary.CoursewareLibraryListVO;
 /**
  * 课件库
@@ -61,5 +62,5 @@ public interface CoursewareLibraryMapper extends BaseMapper<CoursewareLibrary> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<CoursewareLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/pdffilelibrary/PdfLibraryMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.pdffilelibrary.QueryPdfLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryListVO;
 /**
  * PDF
@@ -60,5 +61,5 @@ public interface PdfLibraryMapper extends BaseMapper<PdfLibrary> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<PdfLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/periodical/PeriodVolumeMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.periodical.QueryPeriodVolumeForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.periodical.PeriodVolume;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.periodicel.PeriodVolumeListVO;
 /**
  * PeriodVolume 期刊关联卷期库
@@ -41,5 +42,5 @@ public interface PeriodVolumeMapper extends BaseMapper<PeriodVolume> {
 		    + "and p.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<PeriodVolumeListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 /**
  * 视频库
@@ -61,5 +62,5 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "</script>")
-	List<VideoLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
+	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/animationlibrary/AnimationLibrarySerivceImpl.java

@@ -30,6 +30,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.util.UUIDUtil;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.animationlibrary.AnimationLibraryListVO;
 import com.zrqx.resource.bg.mapper.animationlibrary.AnimationGoodsMapper;
 import com.zrqx.resource.bg.mapper.animationlibrary.AnimationLibraryDiyTypeMapper;
@@ -270,13 +271,13 @@ public class AnimationLibrarySerivceImpl extends BaseServiceImpl<AnimationLibrar
 	 * @date: 2018年11月22日 下午2:39:42
 	 */
 	@Override
-	public PageInfo<AnimationLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("createTime desc");
+			pageParam.setOrderBy("uploadTime desc");
 		}
 		startPage(pageParam);
-		List<AnimationLibraryListVO> list = mapper.queryByTileAndDiyType(form);
-		return new PageInfo<AnimationLibraryListVO>(list);
+		List<ResourceRelationListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/animationlibrary/AnimationLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.core.model.resource.animationlibrary.AnimationLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.animationlibrary.AnimationLibraryListVO;
 /**
  * 动画库
@@ -57,7 +58,7 @@ public interface AnimationLibraryService extends BaseService<AnimationLibrary,In
 	 * @author yzg
 	 * @date: 2018年11月22日 下午2:39:42
 	 */
-	PageInfo<AnimationLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 	/**
 	 * 修改
 	 * @param form

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibrarySerivceImpl.java

@@ -26,6 +26,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.util.UUIDUtil;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 import com.zrqx.resource.bg.mapper.articlelibrary.ArticleGoodsMapper;
 import com.zrqx.resource.bg.mapper.articlelibrary.ArticleLibraryDiyTypeMapper;
@@ -173,13 +174,13 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,In
 		return new PageInfo<ArticleLibraryListVO>(list);
 	}
 	@Override
-	public PageInfo<ArticleLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
 			pageParam.setOrderBy("createTime desc,id asc");
 		}
 		startPage(pageParam);
-		List<ArticleLibraryListVO> list = mapper.queryByTileAndDiyType(form);
-		return new PageInfo<ArticleLibraryListVO>(list);
+		List<ResourceRelationListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibraryService.java

@@ -9,6 +9,7 @@ import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 /**
  * 文章库
@@ -17,5 +18,5 @@ public interface ArticleLibraryService extends BaseService<ArticleLibrary,Intege
 	boolean saveOrUpdate(SaveUpdateArticleLibraryForm form);
 	boolean batchDelete(List<Integer> ids);
 	PageInfo<ArticleLibraryListVO> page(QueryArticleLibraryForm form, PageParam pageParam);
-	PageInfo<ArticleLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java

@@ -29,6 +29,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.util.UUIDUtil;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryListVO;
 import com.zrqx.resource.bg.mapper.audiolibrary.AudioGoodsMapper;
 import com.zrqx.resource.bg.mapper.audiolibrary.AudioLibraryDiyTypeMapper;
@@ -228,14 +229,13 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,Intege
 		return new PageInfo<AudioLibraryListVO>(list);
 	}
 	@Override
-	public PageInfo<AudioLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("createTime desc");
+			pageParam.setOrderBy("uploadTime desc");
 		}
 		startPage(pageParam);
-		List<AudioLibraryListVO> list = mapper.queryByTileAndDiyType(form);
-		
-		return new PageInfo<AudioLibraryListVO>(list);
+		List<ResourceRelationListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryListVO;
 /**
  * 音频库
@@ -58,7 +59,7 @@ public interface AudioLibraryService extends BaseService<AudioLibrary,Integer>{
 	 * @author yzg
 	 * @date: 2018年11月22日 下午2:39:42
 	 */
-	PageInfo<AudioLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 	/**
 	 * 修改
 	 * @param form

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/coursewarelibrary/CoursewareLibrarySerivceImpl.java

@@ -28,6 +28,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.util.UUIDUtil;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.coursewarelibrary.CoursewareLibraryListVO;
 import com.zrqx.resource.bg.mapper.coursewarelibrary.CoursewareGoodsMapper;
 import com.zrqx.resource.bg.mapper.coursewarelibrary.CoursewareLibraryDiyTypeMapper;
@@ -226,12 +227,12 @@ public class CoursewareLibrarySerivceImpl extends BaseServiceImpl<CoursewareLibr
 	}
 	
 	@Override
-	public PageInfo<CoursewareLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
 			pageParam.setOrderBy("createTime desc");
 		}
 		startPage(pageParam);
-		List<CoursewareLibraryListVO> list = mapper.queryByTileAndDiyType(form);
-		return new PageInfo<CoursewareLibraryListVO>(list);
+		List<ResourceRelationListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/coursewarelibrary/CoursewareLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.coursewarelibrary.CoursewareLibraryListVO;
 /**
  * 课件库
@@ -20,7 +21,7 @@ public interface CoursewareLibraryService extends BaseService<CoursewareLibrary,
 	boolean batchInsert(SaveCoursewareLibraryForm form);
 	boolean batchDelete(List<String> ids);
 	PageInfo<CoursewareLibraryListVO> page(QueryCoursewareLibraryForm form, PageParam pageParam);
-	PageInfo<CoursewareLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 	/**
 	 * 修改方法
 	 * @param form

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibrarySerivceImpl.java

@@ -30,6 +30,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.util.UUIDUtil;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryListVO;
 import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfGoodsMapper;
 import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryDiyTypeMapper;
@@ -264,13 +265,13 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
 		return new PageInfo<PdfLibraryListVO>(list);
 	}
 	@Override
-	public PageInfo<PdfLibraryListVO> pageByTitleAndDiyType(
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(
 			QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("uploadTime desc,id asc");
+			pageParam.setOrderBy("uploadTime desc");
 		}
 		startPage(pageParam);
-		List<PdfLibraryListVO> list = mapper.queryByTileAndDiyType(form);
-		return new PageInfo<PdfLibraryListVO>(list);
+		List<ResourceRelationListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryListVO;
 /**
  * PDF
@@ -58,7 +59,7 @@ public interface PdfLibraryService extends BaseService<PdfLibrary,Integer>{
 	 */
 	boolean update(UpdatePdfLibraryForm form);
 	
-	PageInfo<PdfLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/periodical/PeriodVolumeService.java

@@ -12,6 +12,7 @@ import com.zrqx.core.model.resource.periodical.PeriodVolume;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.periodicel.PeriodVolumeListVO;
 
 public interface PeriodVolumeService extends BaseService<PeriodVolume, Integer> {
@@ -40,7 +41,7 @@ public interface PeriodVolumeService extends BaseService<PeriodVolume, Integer>
 	 * @author rjc
 	 * @date: 2019年1月24日 下午2:15:12
 	 */
-	PageInfo<PeriodVolumeListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 	boolean batchDelete(List<String> ids);
 	
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/periodical/PeriodVolumeServiceImpl.java

@@ -19,6 +19,7 @@ import com.zrqx.core.model.resource.videolibrary.VideoResource;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.periodicel.PeriodVolumeListVO;
 import com.zrqx.resource.bg.mapper.periodical.PeriodVolumeMapper;
 import com.zrqx.resource.bg.mapper.periodical.PeriodVolumeResourceMapper;
@@ -68,14 +69,14 @@ public class PeriodVolumeServiceImpl extends BaseServiceImpl<PeriodVolume, Integ
 		return new PageInfo<PeriodVolumeListVO>(list);
 	}
 	@Override
-	public PageInfo<PeriodVolumeListVO> pageByTitleAndDiyType(
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(
 			QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
 			pageParam.setOrderBy("uploadTime desc");
 		}
 		startPage(pageParam);
-		List<PeriodVolumeListVO> list = periodVolumeMapper.queryByTileAndDiyType(form);
-		return new PageInfo<PeriodVolumeListVO>(list);
+		List<ResourceRelationListVo> list = periodVolumeMapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 	@Override
 	public boolean batchDelete(List<String> ids) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -31,6 +31,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.util.UUIDUtil;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoGoodsMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryDiyTypeMapper;
@@ -271,12 +272,12 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
 	 * @date: 2018年11月22日 下午2:39:42
 	 */
 	@Override
-	public PageInfo<VideoLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
+	public PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("createTime desc");
+			pageParam.setOrderBy("uploadTime desc");
 		}
 		startPage(pageParam);
-		List<VideoLibraryListVO> list = mapper.queryByTileAndDiyType(form);
-		return new PageInfo<VideoLibraryListVO>(list);
+		List<ResourceRelationListVo> list = mapper.queryByTileAndDiyType(form);
+		return new PageInfo<ResourceRelationListVo>(list);
 	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
+import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 /**
  * 视频库
@@ -57,7 +58,7 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,Integer>{
 	 * @author yzg
 	 * @date: 2018年11月22日 下午2:39:42
 	 */
-	PageInfo<VideoLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
+	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 	/**
 	 * 修改
 	 * @param form