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

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

@@ -257,7 +257,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(detailService.findByPageInfo(pageInfo, null, filter));
+            return toPage(detailService.findDoneByPageInfo(pageInfo, filter));
         }
     }
 

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryDetailService.java

@@ -65,4 +65,13 @@ public interface PurchaseInquiryDetailService {
      * @return SPage<PurchaseInquiryDetail>
      */
     SPage<PurchaseInquiryDetail> findAppInvalidByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
+
+    /**
+     * 查询已报价数据
+     *
+     * @param pageInfo 分页信息
+     * @param filter 过滤条件
+     * @return SPage<PurchaseInquiryDetail>
+     */
+    SPage<PurchaseInquiryDetail> findDoneByPageInfo(PageInfo pageInfo, SearchFilter filter);
 }

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

@@ -179,4 +179,17 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
         pageInfo.expression(logicalExpression);
         return findByPageInfo(pageInfo, keyword, filter);
     }
+
+    /**
+     * 查询已报价数据
+     *
+     * @param pageInfo 分页信息
+     * @param filter   过滤条件
+     * @return SPage<PurchaseInquiryDetail>
+     */
+    @Override
+    public SPage<PurchaseInquiryDetail> findDoneByPageInfo(PageInfo pageInfo, SearchFilter filter) {
+        pageInfo.expression(PredicateUtils.or(PredicateUtils.isNull("inquiry.check"), PredicateUtils.eq("inquiry.check", Constant.NO, false)));
+        return findByPageInfo(pageInfo, null, filter);
+    }
 }