客户采购询价单列表查看修改。

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

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

@@ -115,7 +115,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 	}
@@ -154,39 +154,39 @@ public class SaleInquiryController {
 		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 	}
 
-//	/**
-//	 * 作为卖家，收到的采购询价（已回复）
-//	 *
-//	 * @param params
-//	 * @return
-//	 */
-//	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
-//	@ResponseBody
-//	public SPage<PurchaseInquiryItem> getDoneInquiries(PageParams params, String keyword) {
-//		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
-//		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-//		// 当前登录企业作为供应商
-//		pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-//		SearchFilter filter = userService.distribute();
-//		if (filter != null && filter.getDistribute() == null) {
-//			return null;
-//		}
-//		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			for (Object object : filter.getDistribute()) {
-//				list.add(object);
-//			}
-//			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-//		}
-//		pageParams.getFilters().put("id_status", Status.REPLIED.value());
-//		HashMap<String, Object> map = new HashMap<>();
-//		map.put("id_invalid", Constant.YES);
-//		pageParams.setNotEqualFilters(map);
-//		List<Sort> sortList = new ArrayList<>();
-//		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
-//		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
-//	}
+	/**
+	 * 作为卖家，收到的采购询价（已回复）
+	 *
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getDoneInquiries(PageParams params, String keyword) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
+		}
+		pageParams.getFilters().put("id_status", Status.REPLIED.value());
+		HashMap<String, Object> map = new HashMap<>();
+		map.put("id_invalid", Constant.YES);
+		pageParams.setNotEqualFilters(map);
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
+	}
 //
 //	/**
 //	 * 作为卖家，收到的采购询价（已作废）