非标物料搜索方法修改；app询价单已报价和已失效接口修改

src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -148,10 +148,10 @@ public class BaseInfoController {
 		pageParams.setKeywordSearchColumns(keywordSearchColumns);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_issale", Constant.YES);
-		pageParams.getFilters().put("pr_standard", Constant.NO);
 
 		HashMap<String, Object> map = new HashMap<>();
 		map.put("pr_b2benabled", Constant.YES);
+		map.put("pr_standard", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
@@ -194,8 +194,7 @@ public class BaseInfoController {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（非标准）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
-		pageInfo.filter("standard", Constant.NO);
-		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
+		return productService.findNotStandardB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
 	/**

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

@@ -250,7 +250,7 @@ public class AppInquiryController {
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（已报价）");
             PageInfo pageInfo = new PageInfo(page, size);
-            pageInfo.filter("overdue", Constant.NO);
+//            pageInfo.filter("overdue", Constant.NO);
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("invalid", Constant.NO);
             pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -300,7 +300,6 @@ public class AppInquiryController {
             logger.log("客户询价单", "查看收到的客户询价单列表（已失效）");
             PageInfo pageInfo = new PageInfo(page, size);
             pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-            pageInfo.filter("invalid", Constant.YES);
             SearchFilter filter = new SearchFilter();
             SearchFilter distribute = userService.distribute();
             if (distribute != null && distribute.getDistribute() == null) {

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

@@ -183,6 +183,16 @@ public interface ProductService {
 	 */
 	public SPage<Product> findB2bEnabledProductInfoByPageInfo(PageInfo pageInfo, String keyword);
 
+	/**
+	 * 分页查找客户物料（非标准未禁用）
+	 *
+	 * @param pageInfo 分页参数
+	 * @param keyword
+	 *            查找关键词
+	 * @return
+	 */
+	SPage<Product> findNotStandardB2bEnabledProductInfoByPageInfo(PageInfo pageInfo, String keyword);
+
 	List<Long> getUnreadIds(String category);
 
 	void setReadByOrder(String category, Long[] sourceId);

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

@@ -451,6 +451,19 @@ public class ProductServiceImpl implements ProductService {
 		return prods;
 	}
 
+	/**
+	 * 分页查找客户物料（非标准未禁用）
+	 *
+	 * @param pageInfo 分页参数
+	 * @param keyword  查找关键词
+	 * @return
+	 */
+	@Override
+	public SPage<Product> findNotStandardB2bEnabledProductInfoByPageInfo(PageInfo pageInfo, String keyword) {
+		pageInfo.expression(PredicateUtils.or(PredicateUtils.isNull("standard"), PredicateUtils.eq("standard", Constant.NO, false)));
+		return findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
+	}
+
 	private Page<Product> findAllProudctByPageInfo(final PageInfo pageInfo, final String keyword) {
 		return productDao.findAll(new Specification<Product>() {
 
@@ -467,8 +480,7 @@ public class ProductServiceImpl implements ProductService {
 
 			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-				pageInfo.expression(PredicateUtils.or(PredicateUtils.isNull("b2bDisabled"),
-                        PredicateUtils.eq("b2bDisabled", Constant.NO, false)));
+				pageInfo.filter("b2bDisabled", Constant.NO);
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}