更新标准与非标准过滤方法

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

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

@@ -99,6 +99,14 @@ public class BaseInfoController {
 	public SPage<Product> getStandardProductInfo(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 需要查询的字段
+		List<String> keywordSearchColumns = new ArrayList<>();
+		keywordSearchColumns.add("pr_kind");
+		keywordSearchColumns.add("pr_pcmpcode");
+		keywordSearchColumns.add("pr_pbranden");
+		keywordSearchColumns.add("pr_pbrand");
+		keywordSearchColumns.add("pr_kinden");
+		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.YES);
@@ -120,6 +128,13 @@ public class BaseInfoController {
 	public SPage<Product> getNonStandardProductInfo(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（非标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 需要查询的字段
+		List<String> keywordSearchColumns = new ArrayList<>();
+		keywordSearchColumns.add("pr_title");
+		keywordSearchColumns.add("pr_spec");
+		keywordSearchColumns.add("pr_brand");
+		keywordSearchColumns.add("pr_cmpcode");
+		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);

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

@@ -80,6 +80,7 @@ public class ProductController {
 	@RequestMapping(value = "/info", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductInfo(PageParams params, String keyword) {
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息（全部）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		List<Sort> sortList = new ArrayList<>();
@@ -98,8 +99,16 @@ public class ProductController {
 	@RequestMapping(value = "/info", params = RequestState.STANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getStandardProductInfo(PageParams params, String keyword) {
-		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息（标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 需要查询的字段
+		List<String> keywordSearchColumns = new ArrayList<>();
+		keywordSearchColumns.add("pr_kind");
+		keywordSearchColumns.add("pr_pcmpcode");
+		keywordSearchColumns.add("pr_pbranden");
+		keywordSearchColumns.add("pr_pbrand");
+		keywordSearchColumns.add("pr_kinden");
+		pageParams.setKeywordSearchColumns(keywordSearchColumns);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_standard", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
@@ -118,8 +127,14 @@ public class ProductController {
 	@RequestMapping(value = "/info", params = RequestState.NONSTANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getNonStandardProductInfo(PageParams params, String keyword) {
-		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息（非标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 需要查询的字段
+		List<String> keywordSearchColumns = new ArrayList<>();
+		keywordSearchColumns.add("pr_title");
+		keywordSearchColumns.add("pr_spec");
+		keywordSearchColumns.add("pr_brand");
+		keywordSearchColumns.add("pr_cmpcode");
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_standard", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();

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

@@ -126,7 +126,7 @@ public class PurcProductController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductInfo(PageParams params, String keyword) {
-		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息（全部）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
@@ -146,8 +146,16 @@ public class PurcProductController {
 	@RequestMapping(params = RequestState.STANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getStandardProductInfo(PageParams params, String keyword) {
-		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息（标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 需要查询的字段
+		List<String> keywordSearchColumns = new ArrayList<>();
+		keywordSearchColumns.add("pr_kind");
+		keywordSearchColumns.add("pr_pcmpcode");
+		keywordSearchColumns.add("pr_pbranden");
+		keywordSearchColumns.add("pr_pbrand");
+		keywordSearchColumns.add("pr_kinden");
+		pageParams.setKeywordSearchColumns(keywordSearchColumns);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
 		pageParams.getFilters().put("pr_standard", Constant.YES);
@@ -167,8 +175,14 @@ public class PurcProductController {
 	@RequestMapping(params = RequestState.NONSTANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getNonStandardProductInfo(PageParams params, String keyword) {
-		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息（非标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 需要查询的字段
+		List<String> keywordSearchColumns = new ArrayList<>();
+		keywordSearchColumns.add("pr_title");
+		keywordSearchColumns.add("pr_spec");
+		keywordSearchColumns.add("pr_brand");
+		keywordSearchColumns.add("pr_cmpcode");
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
 		pageParams.getFilters().put("pr_standard", Constant.NO);