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

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

src/main/java/com/uas/platform/b2b/search/SearchController.java

@@ -260,7 +260,7 @@ public class SearchController {
 	}
 
 	/**
-	 * 物料信息表：products
+	 * 物料信息表：products全部
 	 */
 	@RequestMapping("/products")
 	@ResponseBody
@@ -268,6 +268,24 @@ public class SearchController {
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
 	
+	/**
+	 * 物料信息表：products标准
+	 */
+	@RequestMapping("/products_standard")
+	@ResponseBody
+	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams) {
+		return searchService.searchProductsStandardCheckIds(keyword, pageParams);
+	}
+
+	/**
+	 * 物料信息表：products非标准
+	 */
+	@RequestMapping("/products_nonstandard")
+	@ResponseBody
+	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams) {
+		return searchService.searchProductsNonStandardCheckIds(keyword, pageParams);
+	}
+
 	/**
 	 * 器件信息表
 	 * 

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -302,6 +302,24 @@ public interface SearchService {
 	 */
 	public SPage<Product> searchProductsCheckIds(String keyword, PageParams pageParams);
 
+	/**
+	 * 物料资料（标准）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 物料资料（非标准）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams);
+
 	/**
 	 * 器件信息
 	 * @param keyword

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -1,13 +1,110 @@
 package com.uas.platform.b2b.search;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.util.AccountUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.BrandDao;
+import com.uas.platform.b2b.dao.ComponentDao;
+import com.uas.platform.b2b.dao.DeputyOrderDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.InvitationRecordDao;
+import com.uas.platform.b2b.dao.MakeAcceptDao;
+import com.uas.platform.b2b.dao.MakeOrderChangeItemDao;
+import com.uas.platform.b2b.dao.MakeOrderDao;
+import com.uas.platform.b2b.dao.MakeReturnDao;
+import com.uas.platform.b2b.dao.PagingReleaseDetailDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurcInquiryDao;
+import com.uas.platform.b2b.dao.PurcInquiryItemInfoDao;
+import com.uas.platform.b2b.dao.PurchaseAcceptDao;
+import com.uas.platform.b2b.dao.PurchaseApBillDao;
+import com.uas.platform.b2b.dao.PurchaseApCheckDao;
+import com.uas.platform.b2b.dao.PurchaseBadInDao;
+import com.uas.platform.b2b.dao.PurchaseBadOutDao;
+import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldDao;
+import com.uas.platform.b2b.dao.PurchaseMRBDao;
+import com.uas.platform.b2b.dao.PurchaseNoticeDao;
+import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
+import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
+import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
+import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
+import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
+import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
+import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
+import com.uas.platform.b2b.dao.PurchaseReturnDao;
+import com.uas.platform.b2b.dao.PurchaseTenderDao;
+import com.uas.platform.b2b.dao.SaleARCheckDao;
+import com.uas.platform.b2b.dao.SaleQuotationAllDao;
+import com.uas.platform.b2b.dao.SaleSendAllDao;
+import com.uas.platform.b2b.dao.SaleTenderErpDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.model.SaleTenderItemErp;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.service.ErpProdIODetailService;
+import com.uas.platform.b2b.model.Brand;
+import com.uas.platform.b2b.model.Component;
+import com.uas.platform.b2b.model.DeputyOrder;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.InvitationRecord;
+import com.uas.platform.b2b.model.MakeAccept;
+import com.uas.platform.b2b.model.MakeOrder;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
+import com.uas.platform.b2b.model.MakeReturn;
+import com.uas.platform.b2b.model.PagingReleaseDetail;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurcInquiry;
+import com.uas.platform.b2b.model.PurcInquiryItemInfo;
+import com.uas.platform.b2b.model.PurchaseAccept;
+import com.uas.platform.b2b.model.PurchaseApBill;
+import com.uas.platform.b2b.model.PurchaseApCheck;
+import com.uas.platform.b2b.model.PurchaseBadIn;
+import com.uas.platform.b2b.model.PurchaseBadOut;
+import com.uas.platform.b2b.model.PurchaseForecastAll;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiryMould;
+import com.uas.platform.b2b.model.PurchaseMRB;
+import com.uas.platform.b2b.model.PurchaseNotice;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+import com.uas.platform.b2b.model.PurchaseOrderDone;
+import com.uas.platform.b2b.model.PurchaseOrderEnd;
+import com.uas.platform.b2b.model.PurchaseOrderTodo;
+import com.uas.platform.b2b.model.PurchaseOrderWaiting;
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.PurchaseProofingSend;
+import com.uas.platform.b2b.model.PurchaseReturn;
+import com.uas.platform.b2b.model.PurchaseTender;
+import com.uas.platform.b2b.model.PurchaseTenderProd;
+import com.uas.platform.b2b.model.SaleARCheck;
+import com.uas.platform.b2b.model.SaleQuotationAll;
+import com.uas.platform.b2b.model.SaleSendAll;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.persistence.criteria.PredicateFactory;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -15,19 +112,6 @@ import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.b2b.util.SearchConstants;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 搜索实现
@@ -57,9 +141,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseAcceptDao purchaseAcceptDao;
 
-	@Autowired
-	private PurchaseAcceptItemDao purchaseAcceptItemDao;
-
 	@Autowired
 	private PurchaseApBillDao purchaseApBillDao;
 
@@ -87,9 +168,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseReturnDao purchaseReturnDao;
 
-	@Autowired
-	private PurchaseReturnItemDao purchaseReturnItemDao;
-
 	@Autowired
 	private MakeAcceptDao makeAcceptDao;
 
@@ -129,9 +207,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseApCheckDao purchaseApCheckDao;
 
-	@Autowired
-	private PurchaseApCheckItemDao purchaseApCheckItemDao;
-
 	@Autowired
 	private PurchaseInquiryMouldDao purchaseInquiryMouldDao;
 
@@ -171,9 +246,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private InvitationRecordDao invitationRecordDao;
 
-	@Autowired
-	private ErpProdIODetailService erpProdIODetailService;
-
 	/**
 	 * 联想词size
 	 */
@@ -677,6 +749,22 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
+	@Override
+	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS_STANDARD, pageParams);
+		List<Product> content = productDao.findAll(idsPage.getContent());
+		sortByProperty(content, Product.class, "id", idsPage.getContent());
+		return toSPage(idsPage, content);
+	}
+
+	@Override
+	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS_NONSTANDARD, pageParams);
+		List<Product> content = productDao.findAll(idsPage.getContent());
+		sortByProperty(content, Product.class, "id", idsPage.getContent());
+		return toSPage(idsPage, content);
+	}
+
 	@Override
 	public SPage<Component> searchProductComponentCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCT$COMPONENT, pageParams);
@@ -877,7 +965,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		SPage<String> brandCns = searchService.similar(keyword, Table_name.PRODUCT$BRAND, SIMILAR_NUM, "br_name_cn");
 		// 相似的品牌中文名数量足够，直接返回
 		List<String> brandCnList = brandCns.getContent();
-		List<Map<String, Object>> brands = new ArrayList<>();
 		if (brandCnList != null && brandCnList.size() == SIMILAR_NUM) {
 			return brandCnList;
 		}