询价单获取数据方法进行更新

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

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

@@ -314,6 +314,7 @@ public class SaleInquiryController {
 	public SPage<PurchaseInquiryItem> getPurchaseInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（全部）");
 		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {
@@ -341,7 +342,9 @@ public class SaleInquiryController {
 		logger.log("客户询价单", "查看收到的客户询价单列表（待报价）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("status", Status.NOT_REPLY.value());
-		pageInfo.filter("overdue", Constant.NO);
+		pageInfo.filter("inquiry.overdue", Constant.NO);
+		pageInfo.filter("invalid", Constant.NO);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {
@@ -368,7 +371,9 @@ public class SaleInquiryController {
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesEnd(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
 		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("overdue", Constant.YES);
+		pageInfo.filter("inquiry.overdue", Constant.YES);
+		pageInfo.filter("invalid", Constant.NO);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {
@@ -395,8 +400,10 @@ public class SaleInquiryController {
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesDone(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
 		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("overdue", Constant.NO);
+		pageInfo.filter("inquiry.overdue", Constant.NO);
 		pageInfo.filter("status", Status.REPLIED.value());
+		pageInfo.filter("invalid", Constant.NO);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {
@@ -413,7 +420,7 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已过期）
+	 * 作为卖家，收到的采购询价（已失效）
 	 * 
 	 * @param params
 	 * @return
@@ -423,7 +430,9 @@ public class SaleInquiryController {
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
 		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("overdue", Constant.YES);
+		pageInfo.filter("inquiry.overdue", Constant.YES);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("invalid", Constant.YES);
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {
@@ -440,7 +449,7 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已过期）
+	 * 作为卖家，收到的采购询价（未采纳）
 	 * 
 	 * @param params
 	 * @return
@@ -450,7 +459,10 @@ public class SaleInquiryController {
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesRefused(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
 		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("overdue", Constant.YES);
+		pageInfo.filter("agreed", Constant.NO);
+		pageInfo.filter("status", Status.REPLIED.value());
+		pageInfo.filter("invalid", Constant.NO);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {
@@ -467,7 +479,7 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已过期）
+	 * 作为卖家，收到的采购询价（已采纳）
 	 * 
 	 * @param params
 	 * @return
@@ -475,9 +487,12 @@ public class SaleInquiryController {
 	@RequestMapping(value = "/info", params = RequestState.AGREED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）");
 		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("overdue", Constant.YES);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("agreed", Constant.YES);
+		pageInfo.filter("status", Status.REPLIED.value());
+		pageInfo.filter("invalid", Constant.NO);
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter filters = userService.distribute();
 		if (filters != null && filters.getDistribute() == null) {