更新搜索关于不包含字段的传值方法

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

@@ -958,9 +958,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderDone> getDonePurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（已回复）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderDoneDao.updateStatusForPurcDone(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -977,9 +974,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getToAgreePurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（全部）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.WAITSELLERCOMFIRM.value());
@@ -997,8 +991,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（已结案）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("end", Constant.YES);
@@ -1015,9 +1007,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（待交货）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderWaitingDao.updateStatusForPurc(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);

src/main/java/com/uas/platform/b2b/model/PurchaseForecastAllItem.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * 采购预测单明细
  * 
  * @author hejq
- * @date 2018-07-25 16:19
+ * @date 2018-07-25 17:30
  */
 @Table(name = "purc$forecastitems")
 @Entity

src/main/java/com/uas/platform/b2b/search/RestTempSearchServiceImpl.java

@@ -103,7 +103,7 @@ public class RestTempSearchServiceImpl implements RestTempSearchService {
      * @param fields 搜索字段
      * @return
      */
-    private Map<String,Object> initSimilarMap(String tableName, String keyword, Integer size, String[] fields) {
+    private Map<String, Object> initSimilarMap(String tableName, String keyword, Integer size, String[] fields) {
         Map<String, Object> map = new HashedMap();
         map.put("tableName", tableName);
         map.put("keyword", keyword);
@@ -120,7 +120,7 @@ public class RestTempSearchServiceImpl implements RestTempSearchService {
      * @param pageParams 分页属性
      * @return
      */
-    public Map<String , Object> initSearchMap(String tableName, String keyword, PageParams pageParams) {
+    public Map<String, Object> initSearchMap(String tableName, String keyword, PageParams pageParams) {
         Map<String, Object> map = new HashedMap();
         map.put("tableName", tableName);
         map.put("page", pageParams.getPage());
@@ -142,9 +142,21 @@ public class RestTempSearchServiceImpl implements RestTempSearchService {
                 it.remove();
             }
         }
-        map.put("notEqualFilters", notEqual ? FlexJsonUtils.toJsonDeep(pageParams.getNotEqualFilters()) : "");
+        // notEqualFilters处理和filters一样
+        List<MultiValueField> valueNotFields = new ArrayList<>();
+        if (notEqual) {
+            Iterator<Map.Entry<String, Object>> notFields = pageParams.getNotEqualFilters().entrySet().iterator();
+            while (notFields.hasNext()) {
+                Map.Entry<String, Object> entry = notFields.next();
+                if (entry.getValue() instanceof MultiValue) {
+                    valueNotFields.add(new MultiValueField(entry.getKey(), (MultiValue) entry.getValue()));
+                    notFields.remove();
+                }
+            }
+        }
+        map.put("notEqualFilters", notEqual ? JSON.toJSONString(pageParams.getNotEqualFilters()) : "");
         map.put("multiValueField", CollectionUtils.isEmpty(valueFields) ? "" : FlexJsonUtils.toJsonDeep(valueFields));
-        map.put("multiValueNotField", "");
+        map.put("multiValueNotField", CollectionUtils.isEmpty(valueNotFields) ? "" : FlexJsonUtils.toJsonDeep(valueNotFields));
         map.put("filters", JSON.toJSONString(pageParams.getFilters()));
         return map;
     }