主动报价单搜索过滤修改。

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

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

@@ -119,7 +119,11 @@ public class SaleQuotationController {
 		HashMap<String, Object> map = new HashMap<>();
 		map.put("qu_overdue", Constant.YES); // 未过报价截至有效期
 		pageParams.setNotEqualFilters(map);
-		pageParams.getFilters().put("qu_status", Status.SUBMITTED.value());
+		List<Object> status = new ArrayList<>();
+		status.add((short) Status.SUBMITTED.value());
+		status.add((short) Status.UNAUDIT.value());
+		// 待审批或已提交状态
+		pageParams.getFilters().put("qu_status", new MultiValue(status, true));
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -277,9 +281,7 @@ public class SaleQuotationController {
 		}
 		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : disfilter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(disfilter.getDistribute());
 			filter.setDistribute(list);
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -289,7 +291,7 @@ public class SaleQuotationController {
 	}
 
 	/**
-	 * 作为卖家，查看自己的主动报价单（已提交）
+	 * 作为卖家，查看自己的主动报价单（已报价）
 	 * 
 	 * @param params
 	 * @return
@@ -297,7 +299,7 @@ public class SaleQuotationController {
 	@RequestMapping(value = "/info", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<SaleQuotationDone> getSalQuotationInfoDone(PageParams params, String searchFilter) {
-		logger.log("主动报价单", "查看主动报价单-已提交");
+		logger.log("主动报价单", "查看主动报价单-已报价");
 		// 当前登录企业作为供应商
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter disfilter = userService.distribute();
@@ -306,9 +308,7 @@ public class SaleQuotationController {
 		}
 		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : disfilter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(disfilter.getDistribute());
 			filter.setDistribute(list);
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -335,9 +335,7 @@ public class SaleQuotationController {
 		}
 		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : disfilter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(disfilter.getDistribute());
 			filter.setDistribute(list);
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -365,9 +363,7 @@ public class SaleQuotationController {
 		}
 		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : disfilter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(disfilter.getDistribute());
 			filter.setDistribute(list);
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -395,9 +391,7 @@ public class SaleQuotationController {
 		}
 		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : disfilter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(disfilter.getDistribute());
 			filter.setDistribute(list);
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -426,9 +420,7 @@ public class SaleQuotationController {
 		}
 		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : disfilter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(disfilter.getDistribute());
 			filter.setDistribute(list);
 		}
 		PageInfo pageInfo = new PageInfo(params);