【商务平台】 采购订单更新搜索

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

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

@@ -17,7 +17,7 @@ import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseProofing;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
@@ -51,7 +51,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/purchaseOrder")
 	@ResponseBody
-	public SPage<PurchaseOrder> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseOrderAll> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
 		return searchService.searchPurchaseOrderIds(keyword, pageParams);
 	}
 

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

@@ -12,7 +12,7 @@ import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseProofing;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
@@ -43,7 +43,7 @@ public interface SearchService {
 	 *            状态
 	 * @return 订单数据
 	 */
-	public SPage<PurchaseOrder> searchPurchaseOrderIds(String keyword, PageParams pageParams);
+	public SPage<PurchaseOrderAll> searchPurchaseOrderIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 委外加工单搜索
@@ -188,4 +188,15 @@ public interface SearchService {
 	 */
 	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams);
 
+	/**
+	 * 将com.uas.platform.core.model.PageParams转为搜索项目下的PageParams
+	 * 
+	 * @param params
+	 * @param searchFilter
+	 *            搜索、过滤条件
+	 * @return
+	 */
+	public com.uas.search.b2b.model.PageParams convertPageParams(com.uas.platform.core.model.PageParams params,
+			String searchFilter);
+
 }

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

@@ -1,10 +1,14 @@
 package com.uas.platform.b2b.search;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.MakeAcceptDao;
 import com.uas.platform.b2b.dao.MakeOrderChangeDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
@@ -17,8 +21,8 @@ import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 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.PurchaseOrderDao;
 import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
 import com.uas.platform.b2b.dao.PurchaseProofingDao;
 import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
@@ -38,7 +42,7 @@ import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseProofing;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
@@ -50,6 +54,7 @@ import com.uas.platform.b2b.model.SaleSend;
 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;
 
 /**
  * 搜索实现
@@ -64,7 +69,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private com.uas.search.b2b.service.SearchService searchService;
 
 	@Autowired
-	private PurchaseOrderDao purchaseOrderDao;
+	private PurchaseOrderAllDao purchaseOrderAllDao;
 
 	@Autowired
 	private MakeOrderDao makeOrderDao;
@@ -130,9 +135,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * 采购订单
 	 */
 	@Override
-	public SPage<PurchaseOrder> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseOrderAll> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
-		return toSPage(idsPage, purchaseOrderDao.findAll(idsPage.getContent()));
+		return toSPage(idsPage, purchaseOrderAllDao.findAll(idsPage.getContent()));
 	}
 
 	/**
@@ -344,4 +349,32 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, saleARCheckDao.findAll(idsPage.getContent()));
 	}
 
+	@Override
+	public PageParams convertPageParams(com.uas.platform.core.model.PageParams params, String searchFilter) {
+		if (params == null) {
+			return null;
+		}
+		PageParams pageParams = new PageParams();
+		pageParams.setPage(params.getPage());
+		pageParams.setSize(params.getCount());
+
+		if (!StringUtils.isEmpty(searchFilter)) {
+			JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+			Map<String, Object> filters = new HashMap<>();
+
+			// TODO 确定类型后再删除（value应该是Long）
+			// 只处理开始日期、截止日期两个过滤条件，其他的如状态等过滤条件需要转为数据库中相应字段的名称，需单独进行处理
+			Object fromDate = jsonObject.get(SearchConstants.FROM_DATE_KEY);
+			if (fromDate != null && !fromDate.equals("null")) {
+				filters.put(SearchConstants.FROM_DATE_KEY, fromDate);
+			}
+			Object endDate = jsonObject.get(SearchConstants.END_DATE_KEY);
+			if (endDate != null && !endDate.equals("null")) {
+				filters.put(SearchConstants.END_DATE_KEY, endDate);
+			}
+			pageParams.setFilters(filters);
+		}
+		return pageParams;
+	}
+
 }