【商务平台】 更新搜索

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

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

@@ -13,8 +13,8 @@ import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseApBill;
 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.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseForecastAllItem;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
@@ -25,7 +25,7 @@ import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.model.PurchaseReturn;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleQuotation;
-import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendAll;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 
@@ -97,7 +97,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/purchaseForecastAll")
 	@ResponseBody
-	public SPage<PurchaseForecastAll> searchPurchaseForecastAllIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseForecastAllItem> searchPurchaseForecastAllIds(String keyword, PageParams pageParams) {
 		return searchService.searchPurchaseForecastAllIds(keyword, pageParams);
 	}
 
@@ -106,7 +106,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/purchaseInquiry")
 	@ResponseBody
-	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseInquiryItem> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
 		return searchService.searchPurchaseInquiryIds(keyword, pageParams);
 	}
 
@@ -196,7 +196,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/saleSend")
 	@ResponseBody
-	public SPage<SaleSend> searchSaleSendIds(String keyword, PageParams pageParams) {
+	public SPage<SaleSendAll> searchSaleSendIds(String keyword, PageParams pageParams) {
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
 
@@ -236,4 +236,12 @@ public class SearchController {
 		return searchService.searchSaleARCheckIds(keyword, pageParams);
 	}
 
+	/**
+	 * 应付对账单： sale$apcheck
+	 */
+	@RequestMapping("/purcAPCheck")
+	@ResponseBody
+	public SPage<SaleARCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
+		return searchService.searchSaleARCheckIds(keyword, pageParams);
+	}
 }

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

@@ -6,21 +6,27 @@ import com.uas.platform.b2b.model.MakeOrderChange;
 import com.uas.platform.b2b.model.MakeReturn;
 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.PurchaseApCheckEnd;
 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.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseForecastAllItem;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
 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.PurchaseProofing;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.model.PurchaseReturn;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleQuotation;
-import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendAll;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 
@@ -45,6 +51,42 @@ public interface SearchService {
 	 */
 	public SPage<PurchaseOrderAll> searchPurchaseOrderIds(String keyword, PageParams pageParams);
 
+	/**
+	 * 采购订单（待回复）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseOrderTodo> searchPurchaseTodoOrderIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 采购订单（已回复）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseOrderDone> searchPurchaseDoneOrderIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 采购订单（已结案）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseOrderEnd> searchaPurchaseEndOrderIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 采购订单（待回复）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseOrderWaiting> searchPurchaseWaitingOrderIds(String keyword, PageParams pageParams);
+
 	/**
 	 * 委外加工单搜索
 	 */
@@ -81,7 +123,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<PurchaseForecastAll> searchPurchaseForecastAllIds(String keyword, PageParams pageParams);
+	public SPage<PurchaseForecastAllItem> searchPurchaseForecastAllIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 采购询价单
@@ -90,7 +132,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams);
+	public SPage<PurchaseInquiryItem> searchPurchaseInquiryIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 客户MRB
@@ -111,7 +153,7 @@ public interface SearchService {
 	public SPage<PurchaseOrderChange> searchPurchaseOrderChangeIds(String keyword, PageParams pageParams);
 
 	/**
-	 * 客户打样申请单
+	 * 客户打样申请单(所有)
 	 * 
 	 * @param keyword
 	 * @param pageParams
@@ -162,7 +204,7 @@ public interface SearchService {
 	 * 17.平台发货单搜索
 	 * 
 	 */
-	public SPage<SaleSend> searchSaleSendIds(String keyword, PageParams pageParams);
+	public SPage<SaleSendAll> searchSaleSendIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 18.平台发货提醒单搜索
@@ -188,6 +230,24 @@ public interface SearchService {
 	 */
 	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams);
 
+	/**
+	 * 应收对帐单
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 应收对帐单（已作废）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseApCheckEnd> searchPurchaseApcheckEndIds(String keyword, PageParams pageParams);
+
 	/**
 	 * 将com.uas.platform.core.model.PageParams转为搜索项目下的PageParams
 	 * 

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

@@ -15,42 +15,55 @@ import com.uas.platform.b2b.dao.MakeOrderDao;
 import com.uas.platform.b2b.dao.MakeReturnDao;
 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.PurchaseApCheckEndDao;
 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.PurchaseInquiryDao;
+import com.uas.platform.b2b.dao.PurchaseForecastAllItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
 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.PurchaseProofingDao;
+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.SaleARCheckDao;
 import com.uas.platform.b2b.dao.SaleQuotationDao;
-import com.uas.platform.b2b.dao.SaleSendDao;
+import com.uas.platform.b2b.dao.SaleSendAllDao;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeOrderChange;
 import com.uas.platform.b2b.model.MakeReturn;
 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.PurchaseApCheckEnd;
 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.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseForecastAllItem;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
 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.PurchaseProofing;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.model.PurchaseReturn;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleQuotation;
-import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendAll;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.service.SearchService.Table_name;
@@ -71,6 +84,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseOrderAllDao purchaseOrderAllDao;
 
+	@Autowired
+	private PurchaseOrderTodoDao purchaseOrderTodoDao;
+
 	@Autowired
 	private MakeOrderDao makeOrderDao;
 
@@ -87,10 +103,10 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private PurchaseBadOutDao purchaseBadOutDao;
 
 	@Autowired
-	private PurchaseForecastAllDao purchaseForecastDao;
+	private PurchaseForecastAllItemDao purchaseForecastItemDao;
 
 	@Autowired
-	private PurchaseInquiryDao purchaseInquiryDao;
+	private PurchaseInquiryItemDao purchaseInquiryItemDao;
 
 	@Autowired
 	private PurchaseMRBDao purchaseMRBDao;
@@ -117,7 +133,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private SaleQuotationDao saleQuotationDao;
 
 	@Autowired
-	private SaleSendDao saleSendDao;
+	private SaleSendAllDao saleSendAllDao;
 
 	@Autowired
 	private PurchaseNoticeDao purchaseNoticeDao;
@@ -131,6 +147,24 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private SaleARCheckDao saleARCheckDao;
 
+	@Autowired
+	private PurchaseOrderDoneDao purchaseOrderDoneDao;
+
+	@Autowired
+	private PurchaseOrderEndDao purchaseOrderEndDao;
+
+	@Autowired
+	private PurchaseOrderWaitingDao purchaseOrderWaitingDao;
+
+	@Autowired
+	private PurchaseProofingItemDao purchaseProofingItemDao;
+
+	@Autowired
+	private PurchaseApCheckDao purchaseApCheckDao;
+
+	@Autowired
+	private PurchaseApCheckEndDao purchaseApCheckEndDao;
+
 	/**
 	 * 采购订单
 	 */
@@ -218,18 +252,18 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * 采购预测单
 	 */
 	@Override
-	public SPage<PurchaseForecastAll> searchPurchaseForecastAllIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseForecastAllItem> searchPurchaseForecastAllIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$FORECAST, pageParams);
-		return toSPage(idsPage, purchaseForecastDao.findAll(idsPage.getContent()));
+		return toSPage(idsPage, purchaseForecastItemDao.findAll(idsPage.getContent()));
 	}
 
 	/**
 	 * 采购询价单
 	 */
 	@Override
-	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseInquiryItem> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$INQUIRY, pageParams);
-		return toSPage(idsPage, purchaseInquiryDao.findAll(idsPage.getContent()));
+		return toSPage(idsPage, purchaseInquiryItemDao.findAll(idsPage.getContent()));
 	}
 
 	/**
@@ -246,7 +280,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 */
 	@Override
 	public SPage<PurchaseOrderChange> searchPurchaseOrderChangeIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$PROOFING, pageParams);
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$CHANGES, pageParams);
 		return toSPage(idsPage, purchaseOrderChangeDao.findAll(idsPage.getContent()));
 	}
 
@@ -308,9 +342,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * 平台发货单
 	 */
 	@Override
-	public SPage<SaleSend> searchSaleSendIds(String keyword, PageParams pageParams) {
+	public SPage<SaleSendAll> searchSaleSendIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$SEND, pageParams);
-		return toSPage(idsPage, saleSendDao.findAll(idsPage.getContent()));
+		return toSPage(idsPage, saleSendAllDao.findAll(idsPage.getContent()));
 	}
 
 	/**
@@ -357,10 +391,10 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		PageParams pageParams = new PageParams();
 		pageParams.setPage(params.getPage());
 		pageParams.setSize(params.getCount());
+		Map<String, Object> filters = new HashMap<>();
 
 		if (!StringUtils.isEmpty(searchFilter)) {
 			JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-			Map<String, Object> filters = new HashMap<>();
 
 			// TODO 确定类型后再删除（value应该是Long）
 			// 只处理开始日期、截止日期两个过滤条件，其他的如状态等过滤条件需要转为数据库中相应字段的名称，需单独进行处理
@@ -372,9 +406,57 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 			if (endDate != null && !endDate.equals("null")) {
 				filters.put(SearchConstants.END_DATE_KEY, endDate);
 			}
-			pageParams.setFilters(filters);
 		}
+		pageParams.setFilters(filters);
 		return pageParams;
 	}
 
+	/**
+	 * 采购单（所有）
+	 */
+	@Override
+	public SPage<PurchaseOrderTodo> searchPurchaseTodoOrderIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
+		return toSPage(idsPage, purchaseOrderTodoDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 采购单（已回复）
+	 */
+	@Override
+	public SPage<PurchaseOrderDone> searchPurchaseDoneOrderIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
+		return toSPage(idsPage, purchaseOrderDoneDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 采购单（已结案）
+	 */
+	@Override
+	public SPage<PurchaseOrderEnd> searchaPurchaseEndOrderIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
+		return toSPage(idsPage, purchaseOrderEndDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 采购单（待回复）
+	 */
+	@Override
+	public SPage<PurchaseOrderWaiting> searchPurchaseWaitingOrderIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
+		return toSPage(idsPage, purchaseOrderWaitingDao.findAll(idsPage.getContent()));
+	}
+
+	@Override
+	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$ARCHECK, pageParams);
+		return toSPage(idsPage, purchaseApCheckDao.findAll(idsPage.getContent()));
+	}
+
+	@Override
+	public SPage<PurchaseApCheckEnd> searchPurchaseApcheckEndIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$ARCHECK, pageParams);
+		return toSPage(idsPage, purchaseApCheckEndDao.findAll(idsPage.getContent()));
+	}
+
 }