企业物料获取数据方法更新

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

@@ -80,10 +80,7 @@ public class BaseInfoController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_issale", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -115,10 +112,7 @@ public class BaseInfoController {
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_issale", Constant.YES);
 		pageParams.getFilters().put("pr_standard", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -148,10 +142,9 @@ public class BaseInfoController {
 		pageParams.setKeywordSearchColumns(keywordSearchColumns);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_issale", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		map.put("pr_standard", Constant.YES);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("pr_standard", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
@@ -170,7 +163,7 @@ public class BaseInfoController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		/*pageInfo.filter("b2bDisabled", Constant.NO);*/
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -185,7 +178,7 @@ public class BaseInfoController {
 		pageInfo.filter("isSale", Constant.YES);
 		pageInfo.filter("standard", Constant.YES);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		/*pageInfo.filter("b2bDisabled", Constant.NO);*/
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -200,7 +193,7 @@ public class BaseInfoController {
 		pageInfo.filter("isSale", Constant.YES);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
         pageInfo.filter("standard", Constant.NO);
-		/*pageInfo.filter("b2bDisabled", Constant.NO);*/
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findNotStandardB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 

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

@@ -60,7 +60,7 @@ public class ProductController {
 			pageParams.getFilters().put("pr_enuu", custUU);
 			pageParams.getFilters().put("pr_ispurchase", Constant.YES);
 			HashMap<String, Object> map = new HashMap<>();
-			map.put("pr_b2bdisabled", Constant.YES);
+			map.put("pr_b2cenabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
 			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -87,7 +87,7 @@ public class ProductController {
 			pageParams.getFilters().put("pr_enuu", vendUU);
 			pageParams.getFilters().put("pr_issale", Constant.YES);
 			HashMap<String, Object> map = new HashMap<>();
-			map.put("pr_b2bdisabled", Constant.YES);
+			map.put("pr_b2cenabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
 			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -109,7 +109,7 @@ public class ProductController {
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 
 		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
+		map.put("pr_b2cenabled", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
@@ -141,10 +141,7 @@ public class ProductController {
 		pageParams.setKeywordSearchColumns(keywordSearchColumns);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_standard", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -173,11 +170,7 @@ public class ProductController {
 		keywordSearchColumns.add("pr_code");
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_standard", Constant.NO);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
-
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -196,7 +189,7 @@ public class ProductController {
 	public SPage<Product> getProductInfo(PageParams params, String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-        /*pageInfo.filter("b2bDisabled", Constant.NO);*/
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -213,7 +206,7 @@ public class ProductController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("standard", Constant.YES);
         pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-        /*pageInfo.filter("b2bDisabled", Constant.NO);*/
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -230,7 +223,7 @@ public class ProductController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("standard", Constant.NO);
         pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-        /*pageInfo.filter("b2bDisabled", Constant.NO);*/
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -353,6 +346,7 @@ public class ProductController {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（全部）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());
+		pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -379,6 +373,7 @@ public class ProductController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isPurchase", Constant.YES);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());
+        pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 

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

@@ -32,7 +32,6 @@ import org.springframework.web.servlet.ModelAndView;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -182,10 +181,7 @@ public class PurcProductController {
 		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);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -217,10 +213,7 @@ public class PurcProductController {
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
 		pageParams.getFilters().put("pr_standard", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -250,10 +243,7 @@ public class PurcProductController {
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
 		pageParams.getFilters().put("pr_standard", Constant.NO);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
@@ -270,6 +260,7 @@ public class PurcProductController {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（全部）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isPurchase", Constant.YES);
+		pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -283,6 +274,7 @@ public class PurcProductController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isPurchase", Constant.YES);
 		pageInfo.filter("standard", Constant.YES);
+		pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -296,6 +288,7 @@ public class PurcProductController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isPurchase", Constant.YES);
 		pageInfo.filter("standard", Constant.NO);
+		pageInfo.filter("b2cEnabled", Constant.YES);
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 

src/main/java/com/uas/platform/b2b/model/Product.java

@@ -4,17 +4,7 @@ import com.uas.platform.core.persistence.EnterpriseUU;
 import com.uas.platform.core.persistence.Logger;
 import com.uas.platform.core.persistence.UserUU;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.Set;
@@ -362,6 +352,14 @@ public class Product {
 	@Column(name = "pr_b2bdisabled", insertable = false, updatable = false)
 	private Short b2bDisabled;
 
+	/**
+	 * 公共库启用状态
+	 * 1： 启用
+	 * 0： 禁用
+	 */
+	@Transient
+	private Short b2cEnabled;
+
 	/**
 	 * 匹配的料号（买方）（用于供应商推荐接口匹配状态）
 	 */
@@ -792,6 +790,14 @@ public class Product {
 		this.b2bDisabled = b2bDisabled;
 	}
 
+	public Short getB2cEnabled() {
+		return b2cEnabled;
+	}
+
+	public void setB2cEnabled(Short b2cEnabled) {
+		this.b2cEnabled = b2cEnabled;
+	}
+
 	public String getIfMatched() {
 		return ifMatched;
 	}

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

@@ -717,7 +717,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		pageParams.getFilters().put("pr_issale", Constant.YES);
 
 		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
+		map.put("pr_b2cenabled", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();