Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35757 -r35759
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35757)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35759)
@@ -15733,33 +15733,25 @@
 		}
 		
 		// 查询满足搜索条件的借物单
-		String sql = "select distinct p.id from invoiceplan p,tousseItem i where "
-				+ "p.id = i.recyclingApplication_ID and p.submitTime between "
+		String sql = "select p from RecyclingApplication p where p.submitTime between "
 				+ dateQueryAdapter.dateAdapter(startDay) + " and "
 				+ dateQueryAdapter.dateAdapter(endDay);
-		
 		sql += " and p.committedStatus = 1 and p.type = '"
 				+ InvoicePlan.TYPE_BORROWINGSINGLE + "'";
 		
 		if(StringUtils.isNotBlank(goodsName)){
-			sql += " and i.tousseName = '"+goodsName+"'";	
+			sql += " and EXISTS (select id from TousseItem where invoicePlan.id=p.id and tousseName = '"+goodsName+"')";
 		}
 		if(StringUtils.isNotBlank(deptName)){
 			sql += " and p.depart = '"+deptName+"'";
 		}
 		// 按借物单的创建顺序升序排列，早的排在前面，新的排在后面
 		sql += " order by p.id asc";
-		
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		List<RecyclingApplication> borrowApplications = objectDao.findByHql(sql);
 		List<BorrowingRecordVo> vos = new ArrayList<BorrowingRecordVo>();
-		ResultSet rs = objectDao.executeSql(sql);
-		try {
-			// 遍历每一张借物单
-			while (rs.next()) {
-				String id = rs.getString(1);
-				// 获得借物单
-				RecyclingApplication borrowApplication = (RecyclingApplication)objectDao.getByProperty(
-						RecyclingApplication.class.getSimpleName(), "id", Long.valueOf(id));
+		if(CollectionUtils.isNotEmpty(borrowApplications)){
+			for (RecyclingApplication borrowApplication : borrowApplications) {
 				BorrowingRecordVo vo = new BorrowingRecordVo();
 				
 				// 申请时间
@@ -15855,10 +15847,6 @@
 				}
 				vo.setBorrowingItems(itemVos);
 			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally {
-			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		return vos;
 	}