修改数据库获取失效客户采购询价单逻辑

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

@@ -29,7 +29,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -55,11 +54,14 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
 	@Override
 	public SPage<PurchaseInquiryDetail> findInvalidByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter) {
         SimpleExpression overdue = new SimpleExpression("overdue", Constant.YES, CriterionExpression.Operator.EQ, true);
+		SimpleExpression notReply = new SimpleExpression("status", Status.NOT_REPLY.value(), CriterionExpression.Operator.EQ, true);
+		SimpleExpression[] s1 = new SimpleExpression[]{overdue, notReply};
+		LogicalExpression overdueAndNotReply = new LogicalExpression(s1, CriterionExpression.Operator.AND);
         SimpleExpression invalid = new SimpleExpression("invalid", Constant.YES, CriterionExpression.Operator.EQ, true);
-        SimpleExpression status = new SimpleExpression("status", Status.DISABLED.value(), CriterionExpression.Operator.EQ, true);
-        SimpleExpression[] expressions = new SimpleExpression[]{overdue, invalid, status};
+        SimpleExpression disabled = new SimpleExpression("status", Status.DISABLED.value(), CriterionExpression.Operator.EQ, true);
+        SimpleExpression[] expressions = new SimpleExpression[]{invalid, disabled};
         LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
-        pageInfo.expression(PredicateUtils.and(PredicateUtils.isNull("agreed"), logical));
+        pageInfo.expression(PredicateUtils.and(PredicateUtils.isNull("agreed"), PredicateUtils.or(logical, overdueAndNotReply)));
         return findByPageInfo(pageInfo, keyword, filter);
 	}