认定单增加根据日期筛选以及根据筛选结果导出

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1250 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/PurchaseProofingServiceImpl.java

@@ -359,10 +359,16 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 	}
 
 	@Override
-	public Page<PurchaseProofingApproval> findApprovalsByPageInfo(final PageInfo pageInfo, final String keyword) {
+	public Page<PurchaseProofingApproval> findApprovalsByPageInfo(final PageInfo pageInfo, final String keyword, final Long fromDate, final Long endDate) {
 		if (StringUtils.hasText(keyword))
 			pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalIndexDao.findByKeyword(
 					SystemSession.getUser().getEnterprise().getUu(), keyword), false));
+		if (fromDate != null)
+			pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalDao.findByFromDate(SystemSession
+					.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
+		if(endDate != null)
+			pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalDao.findByEndDate(SystemSession
+					.getUser().getEnterprise().getUu(), new Date(endDate)), false));
 		return purchaseProofingApprovalDao.findAll(new Specification<PurchaseProofingApproval>() {
 			public Predicate toPredicate(Root<PurchaseProofingApproval> root, CriteriaQuery<?> query,
 					CriteriaBuilder builder) {