--no commit message

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

@@ -11,6 +11,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -481,7 +484,7 @@ public class EbookLibraryController {
 		});
 		return null;
 	}
-	/*@ApiOperation(value = "导出图书Excel")
+	@ApiOperation(value = "导出图书Excel")
 	@GetMapping(value = SysUserRequestPath.EXPORT)
 	public String exportCard(QueryEbookForm form, PageParam pageParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		Criteria cr = bookservice.createCriteria();
@@ -491,13 +494,22 @@ public class EbookLibraryController {
 		if (StringUtils.isNotBlank(form.getAuthor())) {
 			cr.andLike("author", "%" + form.getAuthor() + "%");
 		}
-		List<Card> list = service.queryCriteria(pageParam).getList();
+		if (StringUtils.isNotBlank(form.getIsbn())) {
+			cr.andLike("isbn", "%" + form.getIsbn() + "%");
+		}
+		if (StringUtils.isNotBlank(form.getEdition())) {
+			cr.andLike("edition", "%" + form.getEdition() + "%");
+		}
+		if (StringUtils.isNotBlank(form.getExecutiveEditor())) {
+			cr.andLike("executiveEditor", "%" + form.getExecutiveEditor() + "%");
+		}
+		List<Book> list = bookservice.queryCriteria(pageParam).getList();
 		List<ExcelBookVO> voList = Copy.copyList(list,ExcelBookVO.class);
 		
 		ExcelUtil.getInstance().exportExcel(voList, ExcelBookVO.class, "图书信息模板.xls", response, request);
 		
 		return null;
-	}*/
+	}
 	@ApiOperation(value = "添加附件", notes = "添加附件")
 	@PostMapping(value = ResourceRequestPath.SAVE_ATTACHMENT)
 	public CallBack<String> addAttachment(String bookid, String token){

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/RecycleBinController.java

@@ -589,10 +589,15 @@ public class RecycleBinController {
 	@GetMapping(value = SysUserRequestPath.EXPORT)
 	public String exportCard(QueryResourceRelationForm form, PageParam pageParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		Criteria cr = resourceService.createCriteria();
-		if (StringUtils.isNotBlank(form.getResourceType().toString())) {
-			cr.andLike("resourceType", "" + form.getResourceType() + "");
+		if (form.getResourceType() != null) {
+			cr.andEqualTo("resourceType",form.getResourceType());
+		}
+		if (StringUtils.isNotBlank(form.getBeginTime())) {
+			cr.andEqualTo("createTime >", form.getBeginTime());
+		}
+		if (StringUtils.isNotBlank(form.getEndTime())) {
+			cr.andEqualTo("createTime <", form.getEndTime());
 		}
-		
 		List<RecycleBinResource> list = resourceService.queryCriteria(pageParam).getList();
 		List<ExcleRecycleBinVo> voList = Copy.copyList(list,ExcleRecycleBinVo.class);
 		ExcelUtil.getInstance().exportExcel(voList, ExcleRecycleBinVo.class, "回收站资源.xls", response, request);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recycleBin/RecycleBinResourceService.java

@@ -3,7 +3,6 @@ package com.zrqx.resource.bg.service.recycleBin;
 import java.util.List;
 
 import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
-import com.zrqx.core.model.resource.pdffilelibrary.PdfResource;
 import com.zrqx.core.model.resource.recycleBin.RecycleBinResource;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.PageParam;