--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/videolibrary/QueryVideoLibraryForm.java

@@ -15,7 +15,7 @@ public class QueryVideoLibraryForm {
 	private String author;
 	@ApiModelProperty("来源")
 	private String source;
-	@ApiModelProperty("数据来源  1:本版 2外版")
+	@ApiModelProperty("数据来源  0:本版 1外版")
 	private Integer dataSources;
 	@ApiModelProperty("所属图书")
 	private String bookName;

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/recycleBin/ResourceRecycleBinListVO.java

@@ -27,4 +27,6 @@ public class ResourceRecycleBinListVO {
 	private Integer status;	
 	@ApiModelProperty("封面")
 	private String cover;
+	@ApiModelProperty("资源类型 1图书库 2文章库 3期刊库 4论文库 5图片库 6视频库 7音频库 8动画库 9课件库 10法规库 11标准库 12专利库 13成果库 14条文库 15PDF 16专家库 ")
+	private Integer resourceType;
 }

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

@@ -57,10 +57,10 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 		    + "and g.dataSources = #{form.dataSources} "
 		    + "</if>" 
 		    + "<if test = '" + NOTBLANK + "(form.beginTime)'>"  
-		    + "and a.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00' )"
+		    + "and a.uploadTime &gt;= concat(#{form.beginTime}, '00:00:00' )"
 		    + "</if>" 
 		    + "<if test = '" + NOTBLANK + "(form.endTime)'>"  
-		    + "and a.uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
+		    + "and a.uploadTime &lt;= concat(#{form.endTime}, '23:59:59')"
 		    + "</if>"
 		    + "</script>")
 	List<AudioLibraryListVO> query(@Param("form")QueryAudioLibraryForm form);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/recycleBin/RecycleBinMapper.java

@@ -19,12 +19,12 @@ import com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinListVO;
 public interface RecycleBinMapper extends BaseMapper<RecycleBin> {
 	@Select("<script>"
 			+ "<if test='form.diyTypeCode == null'>"  
-				+ "select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,"
+				+ "select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,a.resourceType,"
 			    + "DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') createTime,a.status from res_recycle_bin a "
 			    + "where 1=1 "
 		    + "</if>"
 		    + "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"  
-			    + "select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,"
+			    + "select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,a.resourceType,"
 			    + "DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') createTime,a.status from res_recycle_bin a "
 			    + "INNER JOIN res_recycle_bin_Diy_Type ad on a.id = ad.rlid where 1=1 "
 		    + "</if>"

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

@@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Select;
 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.pdflibrary.PdfLibrary;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
@@ -54,15 +53,14 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 		    + "and a.source like concat('%',#{form.source},'%') "
 		    + "</if>" 
 		    + "<if test = '" + NOTBLANK + "(form.beginTime)'>"  
-		    + "and a.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00' )"
+		    + "and a.uploadTime &gt;= concat(#{form.beginTime}, '00:00:00' ) "
 		    + "</if>" 
 		    + "<if test = '" + NOTBLANK + "(form.endTime)'>"  
-		    + "and a.uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
+		    + "and a.uploadTime &lt;= concat(#{form.endTime}, '23:59:59') "
 		    + "</if>"
-		    + "<if test='"+NOTBLANK+"(form.dataSources)'>"  
+		    + "<if test='form.dataSources !=null'>"  
 		    + "and g.dataSources = #{form.dataSources} "
 		    + "</if>"
-		    
 		    + "</script>")
 	List<VideoLibraryListVO> query(@Param("form")QueryVideoLibraryForm form);