公共询价已报价已失效获取数据方法更新

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

@@ -1039,8 +1039,11 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             pageInfo.filter("overdue", Constant.YES);
             pageInfo.filter("invalid", Constant.NO);
         } else if (state.equals(OrderStatus.invalid.name())) {
-            pageInfo.filter("overdue", Constant.YES);
-            pageInfo.filter("invalid", Constant.YES);
+            SimpleExpression overdue1 = new SimpleExpression("overdue", Constant.NO, CriterionExpression.Operator.NE, true);
+            SimpleExpression invalid = new SimpleExpression("invalid", Constant.NO, CriterionExpression.Operator.NE, true);
+            SimpleExpression[] simpleExpressions = new SimpleExpression[]{invalid, overdue1};
+            LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
+            pageInfo.expression(logical);
         } else if (state.equals(OrderStatus.agreed.name())) {
             pageInfo.filter("agreed", Constant.YES);
             pageInfo.filter("status", Status.REPLIED.value());