商务平台搜索过滤字段调整

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

@@ -98,9 +98,6 @@ public class PubInquiryController {
         PageInfo pageInfo = new PageInfo(params);
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
-        pageInfo.filter("status", Status.NOT_REPLY.value());
-        pageInfo.filter("overdue", Constant.NO);
-        pageInfo.filter("invalid", Constant.NO);
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.todo.name());
     }
 
@@ -115,10 +112,8 @@ public class PubInquiryController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesEnd(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已过期）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("overdue", Constant.YES);
-        pageInfo.filter("invalid", Constant.NO);
-        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.end.name());
     }
 
@@ -133,12 +128,8 @@ public class PubInquiryController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesDone(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已报价）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("overdue", Constant.NO);
-        pageInfo.filter("status", Status.REPLIED.value());
-        pageInfo.filter("invalid", Constant.NO);
-        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-        pageInfo.filter("decideStatus", Status.UNAUDIT.value());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.done.name());
     }
 
@@ -153,10 +144,8 @@ public class PubInquiryController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已失效）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("overdue", Constant.YES);
-        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-        pageInfo.filter("invalid", Constant.YES);
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.invalid.name());
     }
 
@@ -171,11 +160,8 @@ public class PubInquiryController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesRefused(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（未采纳）");
         PageInfo pageInfo = new PageInfo(params);
-        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);
+        filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.refused.name());
     }
 
@@ -190,11 +176,8 @@ public class PubInquiryController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已采纳）");
         PageInfo pageInfo = new PageInfo(params);
-        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);
+        filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.agreed.name());
     }
 

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

@@ -55,7 +55,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiries(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（全部）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
@@ -72,10 +71,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesTodo(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（待报价）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("status", Status.NOT_REPLY.value());
-        pageInfo.filter("overdue", Constant.NO);
-        pageInfo.filter("invalid", Constant.NO);
-        pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.todo.name());
@@ -92,9 +87,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesEnd(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已过期）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("overdue", Constant.YES);
-        pageInfo.filter("invalid", Constant.NO);
-        pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.end.name());
@@ -111,11 +103,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesDone(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已报价）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("overdue", Constant.NO);
-        pageInfo.filter("status", Status.REPLIED.value());
-        pageInfo.filter("invalid", Constant.NO);
-        pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
-        pageInfo.filter("decideStatus", Status.UNAUDIT.value());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.done.name());
@@ -132,9 +119,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已失效）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("overdue", Constant.YES);
-        pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
-        pageInfo.filter("invalid", Constant.YES);
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.invalid.name());
@@ -151,10 +135,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesRefused(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（未采纳）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("agreed", Constant.NO);
-        pageInfo.filter("status", Status.REPLIED.value());
-        pageInfo.filter("invalid", Constant.NO);
-        pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.refused.name());
@@ -171,10 +151,6 @@ public class PubInquiryForPurcController {
     public SPage<PublicInquiryItemInfo> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已采纳）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("inquiry.enUU", 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);
         filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.agreed.name());

src/main/java/com/uas/platform/b2b/ps/InquiryUtils.java

@@ -25,7 +25,7 @@ public class InquiryUtils {
     /**
      * 访问地址
      */
-    private static String url = "http://192.168.253.12:24000";
+    private static String url = "http://192.168.253.192:8080";
 
     /**
      * 传递数据到公共询价接口方法