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

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

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

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderDone;
@@ -26,6 +28,7 @@ import com.uas.platform.b2b.model.PurchaseOrderReply;
 import com.uas.platform.b2b.model.PurchaseOrderTodo;
 import com.uas.platform.b2b.model.PurchaseOrderWaiting;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -37,6 +40,7 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 卖家对订单的操作
@@ -51,6 +55,9 @@ public class SaleOrderController {
 	@Autowired
 	private PurchaseOrderService purchaseOrderService;
 
+	@Autowired
+	private SearchService searchService;
+
 	@Autowired
 	private UserService userService;
 
@@ -111,27 +118,25 @@ public class SaleOrderController {
 	 */
 	@RequestMapping(value = "/items", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseOrderAll> getReceivedPurchaseOrderItems(PageParams params, String searchFilter) {
-		PageInfo info = new PageInfo(params);
+	public SPage<PurchaseOrderAll> getReceivedPurchaseOrderItems(PageParams params, String searchFilter) {
+		System.out.println(params);
+		System.out.println(searchFilter.length());
+		System.out.println(JSON.toJSON(searchFilter));
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（全部）");
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		// 判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if (filter2 != null) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		}
-		return purchaseOrderService.findAllDetailByPageInfo(info, filter);
+		System.out.println(pageParams);
+		return searchService.searchPurchaseOrderIds(keyword, pageParams);
 	}
 
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(待回复)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -139,9 +144,10 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderTodo> getTodoPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待回复）");
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("vendUU",
+		// SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -152,12 +158,12 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findTodoByPageInfo(info, filter);
+		return purchaseOrderService.findTodoByPageInfo(null, filter);
 	}
-	
+
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(已回复)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -165,9 +171,10 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderDone> getDonePurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（已回复）");
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("vendUU",
+		// SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -178,12 +185,12 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findDoneByPageInfo(info, filter);
+		return purchaseOrderService.findDoneByPageInfo(null, filter);
 	}
 
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(已结案)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -191,9 +198,10 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderEnd> getEndPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（已结案）");
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("vendUU",
+		// SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -204,7 +212,7 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findEndByPageInfo(info, filter);
+		return purchaseOrderService.findEndByPageInfo(null, filter);
 	}
 
 	/**
@@ -216,8 +224,9 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderWaiting> getWaitingPurchaseOrderItems(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
-		PageInfo info = new PageInfo(params);
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// PageInfo info = new PageInfo(params);
+		// info.filter("vendUU",
+		// SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -228,30 +237,32 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findWaitingByPageInfo(info, filter);
+		return purchaseOrderService.findWaitingByPageInfo(null, filter);
 	}
 
 	/**
 	 * 作为卖家，回复收到的采购订单
-	 * 
+	 *
 	 * @param json
 	 * @param orderItemId
 	 * @return
 	 */
 	@RequestMapping(value = "/items/{orderItemId}/reply", method = RequestMethod.POST)
-	public ResponseEntity<String> replyOrderItem(@RequestBody String json, @PathVariable("orderItemId") Long orderItemId) {
+	public ResponseEntity<String> replyOrderItem(@RequestBody String json,
+			@PathVariable("orderItemId") Long orderItemId) {
 		PurchaseOrderReply reply = FlexJsonUtils.fromJson(json, PurchaseOrderReply.class);
 		PurchaseOrderItem orderItem = new PurchaseOrderItem();
 		orderItem.setId(orderItemId);
 		reply.setOrderItem(orderItem);
 		reply = purchaseOrderService.reply(reply);
-		logger.log("客户采购单", "单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(), orderItemId);
+		logger.log("客户采购单", "单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
+				orderItemId);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
 	/**
 	 * 作为卖家，查看我的回复
-	 * 
+	 *
 	 * @param orderItemId
 	 *            订单明细行ID
 	 * @return
@@ -264,7 +275,7 @@ public class SaleOrderController {
 
 	/**
 	 * 作为卖家，批量回复采购订单
-	 * 
+	 *
 	 * @param idString
 	 * @return
 	 */
@@ -272,14 +283,14 @@ public class SaleOrderController {
 	public ResponseEntity<String> replyOrderItems(@RequestBody String idString) {
 		List<PurchaseOrderReply> replies = purchaseOrderService.reply(idString.split(","));
 		for (PurchaseOrderReply reply : replies)
-			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(), reply.getOrderItem()
-					.getId());
+			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
+					reply.getOrderItem().getId());
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
 	/**
 	 * 修改查看状态，修改为已查看
-	 * 
+	 *
 	 * @param idString
 	 * @return
 	 */
@@ -294,7 +305,7 @@ public class SaleOrderController {
 
 	/**
 	 * 修改查看状态，修改为未查看
-	 * 
+	 *
 	 * @param idString
 	 * @return
 	 */
@@ -309,7 +320,7 @@ public class SaleOrderController {
 
 	/**
 	 * 修改查看状态，修改为置顶
-	 * 
+	 *
 	 * @param idString
 	 * @return
 	 */
@@ -324,7 +335,7 @@ public class SaleOrderController {
 
 	/**
 	 * 导出 - 全部
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -346,7 +357,7 @@ public class SaleOrderController {
 
 	/**
 	 * 导出 - 待回复
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -368,7 +379,7 @@ public class SaleOrderController {
 
 	/**
 	 * 导出 - 已回复
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -390,7 +401,7 @@ public class SaleOrderController {
 
 	/**
 	 * 导出 - 已结案
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -412,7 +423,7 @@ public class SaleOrderController {
 
 	/**
 	 * 导出 - 待交货
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -431,20 +442,20 @@ public class SaleOrderController {
 		logger.log("客户采购单", "导出Excel列表", "导出待交货Excel列表");
 		return modelAndView;
 	}
-	
+
 	/**
 	 * 作为买家，收到的采购订单(含明细)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
 	@RequestMapping(value = "/items/purc", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<PurchaseOrderAll> getAllPurcOrderItems(PageParams params, String searchFilter) {
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		logger.log("平台采购单", "查看收到的采购订单列表（包括采购明细）（全部）");
 		// 我作为买家，把我的企业ID作为供应商ID传入
-		info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -455,13 +466,12 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findAllDetailByPageInfo(info, filter);
+		return purchaseOrderService.findAllDetailByPageInfo(null, filter);
 	}
-	
-	
+
 	/**
 	 * 作为买家（常见是有UAS系统的,万利达这种），发出的采购订单(含明细)(待回复)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -469,9 +479,9 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderTodo> getTodoPurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("平台采购单", "查看发出的采购订单列表（包括采购明细）（待回复）");
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		// 我作为买家，把我的企业ID作为供应商ID传入
-		info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -482,12 +492,12 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findTodoByPageInfo(info, filter);
+		return purchaseOrderService.findTodoByPageInfo(null, filter);
 	}
-	
+
 	/**
 	 * 作为买家（常见是有UAS系统的,万利达这种），发出的采购订单(含明细)(已回复)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -495,9 +505,9 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderDone> getDonePurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("平台采购单", "查看收到的采购订单列表（包括采购明细）（已回复）");
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		// 我作为买家，把我的企业ID作为供应商ID传入
-		info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -508,12 +518,12 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findDoneByPageInfo(info, filter);
+		return purchaseOrderService.findDoneByPageInfo(null, filter);
 	}
 
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(已结案)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -521,9 +531,9 @@ public class SaleOrderController {
 	@ResponseBody
 	public Page<PurchaseOrderEnd> getEndPurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("平台采购单", "查看收到的采购订单列表（包括采购明细）（已结案）");
-		PageInfo info = new PageInfo(params);
+		// PageInfo info = new PageInfo(params);
 		// 我作为买家，把我的企业ID作为供应商ID传入
-		info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		// info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -534,20 +544,20 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findEndByPageInfo(info, filter);
+		return purchaseOrderService.findEndByPageInfo(null, filter);
 	}
 
 	/**
 	 * @param params
 	 * @param searchFilter
-	 *  获取待发货的订单
+	 *            获取待发货的订单
 	 */
 	@RequestMapping(value = "/items/purc", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public Page<PurchaseOrderWaiting> getWaitingPurcOrderItems(PageParams params, String searchFilter) {
 		logger.log("平台采购单", "查看收到的采购订单列表（包括采购明细）（待交货）");
-		PageInfo info = new PageInfo(params);
-		info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		// PageInfo info = new PageInfo(params);
+		// info.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
@@ -558,6 +568,6 @@ public class SaleOrderController {
 				filter.setDistribute(filter2.getDistribute());
 			}
 		}
-		return purchaseOrderService.findWaitingByPageInfo(info, filter);
+		return purchaseOrderService.findWaitingByPageInfo(null, filter);
 	}
 }