--no commit message

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/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>"
@@ -42,10 +42,10 @@ public interface RecycleBinMapper extends BaseMapper<RecycleBin> {
 		    + "and a.name like concat('%',#{form.name},'%') "
 		    + "</if>" 
 		    + "<if test = '" + NOTBLANK + "(form.beginTime)'>"  
-		    + "and a.createTime &gt;= concat(#{form.beginTime}, ' 00:00:00' )"
+		    + "and a.createTime &gt;= concat(#{form.beginTime}, '00:00:00' )"
 		    + "</if>" 
 		    + "<if test = '" + NOTBLANK + "(form.endTime)'>"  
-		    + "and a.createTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
+		    + "and a.createTime &lt;= concat(#{form.endTime}, '23:59:59')"
 		    + "</if>"
 		    + "</script>")
 	List<ResourceRecycleBinListVO> query(@Param("form")QueryRecycleBinForm form);