企业商机和个人商机增加可报价过滤参数

src/main/java/com/uas/ps/inquiry/page/SearchFilter.java

@@ -71,10 +71,23 @@ public class SearchFilter {
 	private Short isLogin;
 
 	/**
-	 * 是否为全部，1为全部，0为部分
+	 * 是否返回全部实体数据，1为全部，0为部分
 	 */
 	private Integer isAll;
 
+	/**
+	 * 是否能报价的 1为是 0为否
+	 */
+	private Integer enableOffer;
+
+	public Integer getEnableOffer() {
+		return enableOffer;
+	}
+
+	public void setEnableOffer(Integer enableOffer) {
+		this.enableOffer = enableOffer;
+	}
+
 	public Integer getIsAll() {
 		return isAll;
 	}

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -541,8 +541,12 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             if (filter.getEndDate() != null) {
                 pageInfo.expression(PredicateUtils.lte("reDate", new Date(filter.getEndDate()), false));
             }
+            if (filter.getEnableOffer() != null && filter.getEnableOffer() == 1) {
+                pageInfo.expression(PredicateUtils.gt("endDate", new Date(), false));
+            }
         }
         Page reminds = remindDao.findAll(new Specification<InquiryRemind>() {
+            @Override
             public Predicate toPredicate(Root<InquiryRemind> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 query.where(pageInfo.getPredicates(root, query, builder));
                 return null;
@@ -586,6 +590,13 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         return remindIPage;
     }
 
+    /**
+     * 分页查询企业商机
+     * @param pageInfo
+     * @param filter
+     * @return
+     */
+    @Override
     public IPage<InquiryEnRemind> findEnRemindByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
         if (pageInfo.getOffset() == 0) {
@@ -615,8 +626,12 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 pageInfo.filter("remindStatus", 0);
                 isAll = filter.getIsAll();
             }
+            if (filter.getEnableOffer() != null && filter.getEnableOffer() == 1) {
+                pageInfo.expression(PredicateUtils.gt("endDate", new Date(), false));
+            }
         }
         Page reminds = inquiryEnRemindDao.findAll(new Specification<InquiryEnRemind>() {
+            @Override
             public Predicate toPredicate(Root<InquiryEnRemind> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 query.where(pageInfo.getPredicates(root, query, builder));
                 return null;