物料新增两个查询方法，标准和非标准。搜索不同的字段

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9369 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -105,7 +105,7 @@ public class BaseInfoController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return searchService.searchProductsStandardCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -126,7 +126,7 @@ public class BaseInfoController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return searchService.searchProductsNonStandardCheckIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -105,7 +105,7 @@ public class ProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return searchService.searchProductsStandardCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -125,7 +125,7 @@ public class ProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return searchService.searchProductsNonStandardCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -277,6 +277,7 @@ public class ProductController {
 		pageParams.getFilters().put("pr_matchstatus", Status.SUBMITTED.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}

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

@@ -154,7 +154,7 @@ public class PurcProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return searchService.searchProductsStandardCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -175,7 +175,7 @@ public class PurcProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return searchService.searchProductsNonStandardCheckIds(keyword, pageParams);
 	}
 
 	/**