搜索controller增加multiValueNotField参数

search-console-b2b/src/main/java/com/uas/search/console/b2b/controller/SearchController.java

@@ -45,7 +45,8 @@ public class SearchController {
 	@RequestMapping("")
 	@ResponseBody
 	public SPage<Long> searchIds(String keyword, String tableName, Integer page, Integer size,
-			String keywordSearchColumns, String filters, String multiValueField, String sort, String notEqualFilters) {
+			String keywordSearchColumns, String filters, String multiValueField, String sort, String notEqualFilters,
+			String multiValueNotField) {
 		Table_name tbName = null;
 		if (!StringUtils.isEmpty(tableName)) {
 			tbName = Table_name.valueOf(tableName.toUpperCase());
@@ -92,6 +93,15 @@ public class SearchController {
 		if (!StringUtils.isEmpty(notEqualFilters)) {
 			notEqualFiltersMap.putAll(JSONObject.parseObject(notEqualFilters));
 		}
+		if (!StringUtils.isEmpty(multiValueNotField)) {
+			JSONArray jsonArray = JSONObject.parseArray(multiValueNotField);
+			for (int i = 0; i < jsonArray.size(); i++) {
+				JSONObject jsonObject = jsonArray.getJSONObject(i);
+				String field = jsonObject.getString("field");
+				MultiValue multiValue = jsonObject.getObject("multiValue", MultiValue.class);
+				notEqualFiltersMap.put(field, multiValue);
+			}
+		}
 		if (!CollectionUtils.isEmpty(notEqualFiltersMap)) {
 			pageParams.setNotEqualFilters(notEqualFiltersMap);
 		}

search-console-b2b/src/main/webapp/WEB-INF/views/console.html

@@ -11,7 +11,7 @@
 			<strong><li class="title">搜索</li></strong>
 			<ol>
 			<!-- 此处"&not;"为字符"¬"，于是使用 "&amp;"表示"&"-->
-				<li>search?keyword=P&tableName=PURC$ORDERS&keywordSearchColumns=pu_code,pu_venduu&filters={"pu_enuu":10041166,"fromDate":1435680000000,"endDate":1479214994000}&multiValueField=[{"field":"pu_status","multiValue":{"or":true,"values":[200,201]}}]&sort=[{"field":"pu_id","reverse":1,"type":"LONG"},{"field":"pu_date","reverse":true,"type":"LONG","missingValue":2433211087000}]&amp;notEqualFilters={"pu_status":"200","pu_end":1}</li>
+				<li>search?keyword=P&tableName=PURC$ORDERS&keywordSearchColumns=pu_code,pu_venduu&filters={"pu_enuu":10041166,"fromDate":1435680000000,"endDate":1479214994000}&multiValueField=[{"field":"pu_status","multiValue":{"or":true,"values":[200,201]}}]&sort=[{"field":"pu_id","reverse":1,"type":"LONG"},{"field":"pu_date","reverse":true,"type":"LONG","missingValue":2433211087000}]&amp;notEqualFilters={"pu_status":"200","pu_end":1}&multiValueNotField=[{"field":"pu_status","multiValue":{"or":true,"values":[200,201]}}]</li>
 				<li><a target="_blank">search?keyword=PMP1506000&tableName=PURC$ORDERS</a></li>
 				<li><a target="_blank">search?keyword=MSQ150800&tableName=MAKE$ORDERS</a></li>
 			</ol>