发货单检索

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

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

@@ -209,12 +209,12 @@ public class SaleNoticeController {
 	 */
 	@RequestMapping(value = "/sends", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<SaleSendAll> getSaleSends(PageParams params) {
+	public Page<SaleSendAll> getSaleSends(PageParams params, String keyword) {
 		logger.log("发货单", "查看全部的送货单");
 		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseNoticeService.findSendsByPageInfo(info);
+		return purchaseNoticeService.findSendsByPageInfo(info, keyword);
 	}
 
 	/**
@@ -337,14 +337,14 @@ public class SaleNoticeController {
 	 * @return
 	 */
 	@RequestMapping(value = "/sends/xls", method = RequestMethod.GET)
-	public ModelAndView exportSends() {
+	public ModelAndView exportSends(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseNoticeService.findSendsByPageInfo(pageInfo).getContent());
+		modelAndView.addObject("data", purchaseNoticeService.findSendsByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleSend", "发货单列表"));
 		logger.log("发货单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

src/main/java/com/uas/platform/b2b/service/PurchaseNoticeService.java

@@ -57,7 +57,7 @@ public interface PurchaseNoticeService {
 	 * @param pageInfo
 	 * @return
 	 */
-	public Page<SaleSendAll> findSendsByPageInfo(PageInfo pageInfo);
+	public Page<SaleSendAll> findSendsByPageInfo(PageInfo pageInfo, String keyword);
 
 	/**
 	 * 分页查找送货提醒单

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

@@ -22,6 +22,7 @@ import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.dao.PurchaseNoticeIndexDao;
 import com.uas.platform.b2b.dao.SaleSendAllDao;
 import com.uas.platform.b2b.dao.SaleSendDao;
+import com.uas.platform.b2b.dao.SaleSendIndexDao;
 import com.uas.platform.b2b.dao.SaleSendItemDao;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.PurchaseNoticeSaveEvent;
@@ -57,6 +58,9 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 
 	@Autowired
 	private PurchaseNoticeIndexDao purchaseNoticeIndexDao;
+	
+	@Autowired
+	private SaleSendIndexDao saleSendIndexDao;
 
 	@Override
 	public void save(List<PurchaseNotice> notices) {
@@ -308,12 +312,15 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	}
 
 	@Override
-	public Page<SaleSendAll> findSendsByPageInfo(final PageInfo pageInfo) {
+	public Page<SaleSendAll> findSendsByPageInfo(final PageInfo pageInfo, String keyword) {
+		if (StringUtils.hasText(keyword))
+			pageInfo.expression(PredicateUtils.in("id",
+					saleSendIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
 		return saleSendAllDao.findAll(new Specification<SaleSendAll>() {
 
+			@Override
 			public Predicate toPredicate(Root<SaleSendAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
+				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
 	}