采购询价查询数据过滤条件更新

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -112,7 +112,8 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(detailService.findAllByPageInfo(pageInfo, null, filter));
+            SPage<PurchaseInquiryDetail> detailPage = detailService.findByPageInfo(pageInfo, null, filter);
+            return toPage(detailPage);
         }
     }
 

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

@@ -53,15 +53,23 @@ 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[] overdueExpress = new SimpleExpression[]{overdue, notReply};
+		LogicalExpression overdueAndNotReply = new LogicalExpression(overdueExpress, CriterionExpression.Operator.AND);
+
+		// 未回复已失效
         SimpleExpression invalid = new SimpleExpression("invalid", Constant.YES, CriterionExpression.Operator.EQ, true);
         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.or(logical, overdueAndNotReply));
+        SimpleExpression[] invalidExpressions = new SimpleExpression[]{invalid, disabled};
+        LogicalExpression logical = new LogicalExpression(invalidExpressions, CriterionExpression.Operator.OR);
+
+        // 未回复客户已提交
+        SimpleExpression check = new SimpleExpression("inquiry.check", Constant.YES, CriterionExpression.Operator.EQ, true);
+        SimpleExpression[] checkExpressions = new SimpleExpression[]{check, notReply};
+        LogicalExpression checkedAndNotReply = new LogicalExpression(checkExpressions, CriterionExpression.Operator.OR);
+        pageInfo.expression(PredicateUtils.or(logical, overdueAndNotReply, checkedAndNotReply));
         return findByPageInfo(pageInfo, keyword, filter);
 	}