采购单数据库直接获取，过滤掉申请中的单据。

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

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

@@ -1,43 +1,12 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
 import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
-import com.uas.platform.b2b.model.OrderType;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderDone;
-import com.uas.platform.b2b.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.PurchaseOrderReceived;
-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.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.UserService;
@@ -57,6 +26,21 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 卖家对订单的操作
@@ -179,14 +163,12 @@ public class SaleOrderController {
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
-				list.add(object);
-			}
+			list.addAll(filter.getDistribute());
 			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
 		}
 		// TODO 其他过滤条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("pu_status", (short) Status.UNAUDIT.value());

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -859,6 +859,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 				ModelMap map = new ModelMap();
 				map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 				pageParams.setFilters(map);
+				ModelMap notEqualMap = new ModelMap();
+				notEqualMap.put("pu_status", Status.UNAUDIT.value());
+				pageParams.setNotEqualFilters(notEqualMap);
 				for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
 						.getContent()) {
 					lists.add(list.getId());