--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/pdffilelibrary/FgPdfLibraryController.java

@@ -68,12 +68,5 @@ public class FgPdfLibraryController {
 		}
 		return CallBack.success(vo);
 	}
-	@ApiOperation(value = "分页查询" , notes ="查询列表")
-	@GetMapping(value = "/page")
-	public CallBack<PageInfo<PdfLibraryListVO>> page(QueryPdfLibraryForm form, PageParam pageParam){
-		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
-			pageParam.setOrderBy("uploadTime desc,id desc");
-		}
-		return CallBack.success(service.page(form, pageParam));
-	}
+
 }

app/resource/src/main/java/com/zrqx/resource/fg/controller/videolibrary/FgVideoLibraryController.java

@@ -25,12 +25,16 @@ import com.zrqx.core.client.sysuser.fg.FgSysuserClient;
 import com.zrqx.core.client.vo.sysuser.FgCommentNumAndScoreVo;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.resource.commons.form.bg.articlelibrary.SaveUpdateArticleLibraryForm;
+import com.zrqx.resource.commons.form.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.resource.commons.form.fg.organmemberrecord.FgSaveOrganMemberRecordForm;
 import com.zrqx.resource.commons.form.fg.videolibrary.FgVideoLookForm;
 import com.zrqx.resource.commons.model.recommend.RecommendResource;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
+import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.marketing.FgPromotionInfoOneVO;
 import com.zrqx.resource.commons.vo.fg.resource.FgAboutListVo;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryVO;
@@ -79,6 +83,12 @@ public class FgVideoLibraryController {
 		return CallBack.success(vo);
 	}
 	
+	@ApiOperation(value = "分页查询PDF和视频" , notes ="查询列表")
+	@GetMapping(value = "/pagePdfAndVideo")
+	public CallBack<PageInfo<VideoLibraryListVO>> pagePdfAndVideo(QueryVideoLibraryForm form, PageParam pageParam){
+		return CallBack.success(service.pagePdfAndVideo(form, pageParam));
+	}
+	
 	@ApiOperation(value = "视频相关资源", notes = "查询视频相关资源")
 	@GetMapping(value = "/relation-resource/{oid}")
 	public CallBack<List<FgAboutListVo>> queryByRelation(@PathVariable String oid){

app/resource/src/main/java/com/zrqx/resource/fg/mapper/videolibrary/FgVideoLibraryMapper.java

@@ -6,8 +6,11 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.resource.bg.mapper.MapperConstants;
+import com.zrqx.resource.commons.form.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.resource.commons.form.fg.videolibrary.FgQueryRecommedVideoForm;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
+import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryListVO;
 /**
  * 视频库
@@ -38,7 +41,26 @@ public interface FgVideoLibraryMapper extends BaseMapper<VideoLibrary> {
 			+ "</if>" 
 		    + "</script>")
 	List<FgVideoLibraryListVO> queryRecommendVideo(@Param("form")FgQueryRecommedVideoForm form);
-
+	@Select("<script>" 
+			+ "select distinct a.id,a.readTextPower,a.name,a.source,a.bookName,a.realprice,a.timeLength,a.size,a.uploadTime,a.status "
+			+ "from res_video_library a left join res_video_library_diy_type ad "
+			+ "on a.id = ad.vlid "
+			+ "where 1=1 "
+			+ "<if test = '"+NOTBLANK+"(form.diyTypeCode)' >"
+			+ " and ad.code like concat(#{form.diyTypeCode},'%')  "
+			+ "</if>"
+			
+			+ " union all  "
+			+ "select distinct a.id,null readTextPower,a.name,a.source, null bookName,null realprice,null timeLength,null size,a.uploadTime,a.status "
+			+ "from res_pdf_library a left join res_pdf_library_diy_type ad "
+			+ "on a.id = ad.plid "
+			+ "where 1=1 "
+			+ "<if test = '"+NOTBLANK+"(form.diyTypeCode)' >"
+			+ " and ad.code like concat(#{form.diyTypeCode},'%')  "
+			+ "</if>"
+		    + " order by uploadTime desc "
+		    + "</script>")
+	List<VideoLibraryListVO> query(@Param("form")QueryVideoLibraryForm form);
 	/**
 	 * 获取其他推荐视频
 	 * @param form

app/resource/src/main/java/com/zrqx/resource/fg/service/videolibrary/FgVideoLibrarySerivceImpl.java

@@ -31,11 +31,13 @@ import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.resource.commons.form.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.resource.commons.form.fg.videolibrary.FgQueryRecommedVideoForm;
 import com.zrqx.resource.commons.model.courcelibrary.CourseLibrary;
 import com.zrqx.resource.commons.model.courcelibrary.CourseLibraryDiyType;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibraryDiyType;
+import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryVO;
 import com.zrqx.resource.fg.manage.memberconllection.FgMemberConllectionManage;
@@ -113,7 +115,22 @@ public class FgVideoLibrarySerivceImpl extends
 		});
 		return true;
 	}
-
+	/**
+	 * 后台分页查询
+	 * @param form
+	 * @param pageParam
+	 * @return
+	 * @author yzg
+	 * @date: 2018年11月22日 下午2:39:32
+	 */
+	@Override
+	public PageInfo<VideoLibraryListVO> pagePdfAndVideo(QueryVideoLibraryForm form, PageParam pageParam) {
+		startPage(pageParam);
+		//暂不用自定义分类id 做in查询
+		form.setDiyTypeId(null);
+		List<VideoLibraryListVO> list = mapper.query(form);
+		return new PageInfo<VideoLibraryListVO>(list);
+	}
 	/**
 	 * 获取指定数量的推荐视频
 	 */

app/resource/src/main/java/com/zrqx/resource/fg/service/videolibrary/FgVideoLibraryService.java

@@ -6,8 +6,10 @@ import com.zrqx.core.client.form.order.OrderInfo;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.resource.commons.form.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.resource.commons.form.fg.videolibrary.FgQueryRecommedVideoForm;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
+import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryVO;
 /**
@@ -22,6 +24,16 @@ public interface FgVideoLibraryService extends BaseService<VideoLibrary,String>{
 	 * @date: 2019年1月14日 下午3:57:47
 	 */
 	boolean updateGoodsSales(List<OrderInfo> list);
+	
+	/**
+	 * 后台分页查询
+	 * @param form
+	 * @param pageParam
+	 * @return
+	 * @author yzg
+	 * @date: 2018年11月22日 下午2:39:32
+	 */
+	PageInfo<VideoLibraryListVO> pagePdfAndVideo(QueryVideoLibraryForm form, PageParam pageParam);
 
 	/**
 	 * 获取指定数量的推荐视频