移动端查询询价单方法更新

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -1,9 +1,11 @@
 package com.uas.platform.b2b.mobile.controller;
 
+import com.uas.platform.b2b.model.PurchaseInquiryDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
+import com.uas.platform.b2b.service.PurchaseInquiryDetailService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -52,6 +54,9 @@ public class AppInquiryController {
     @Autowired
     private SearchService searchService;
 
+    @Autowired
+    private PurchaseInquiryDetailService detailService;
+
     /**
      * 询价种类
      */
@@ -68,7 +73,7 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getReceivedPurchaseInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getReceivedPurchaseInquiries(int page, int size, String keyword) {
         // 关键词不为空，使用索引
         if (!StringUtils.isEmpty(keyword)) {
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -86,9 +91,8 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            Page<PurchaseInquiryItem> purchaseInquiryItemPage = searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
             logger.log("客户询价单", "app搜索查看收到的客户询价单列表（全部）");
-            return purchaseInquiryItemPage;
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             PageInfo pageInfo = new PageInfo(page, size);
             pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -108,7 +112,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findAllByPageInfo(pageInfo, null, filter));
+            return toPage(detailService.findAllByPageInfo(pageInfo, null, filter));
         }
     }
 
@@ -121,7 +125,7 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getTodoInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getTodoInquiries(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索查看收到的客户询价单（待报价）");
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -141,13 +145,11 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（待报价）");
             PageInfo pageInfo = new PageInfo(page, size);
             pageInfo.filter("status", Status.NOT_REPLY.value());
-            pageInfo.filter("overdue", Constant.NO);
-            pageInfo.filter("invalid", Constant.NO);
             pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
             SearchFilter filter = new SearchFilter();
             SearchFilter distribute = userService.distribute();
@@ -157,7 +159,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findTodoByPageInfo(pageInfo, null, filter));
+            return toPage(detailService.findTodoByPageInfo(pageInfo, null, filter));
         }
     }
 
@@ -170,7 +172,7 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getEndInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getEndInquiries(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索查看收到的客户询价单（已过期）");
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -193,7 +195,7 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
             PageInfo pageInfo = new PageInfo(page, size);
@@ -208,7 +210,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findAllByPageInfo(pageInfo, null, filter));
+            return toPage(detailService.findByPageInfo(pageInfo, null, filter));
         }
     }
 
@@ -221,10 +223,10 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getDoneInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getDoneInquiries(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索查看收到的客户询价单（已报价）");
-            com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
+            com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<>(1));
             // 当前登录企业作为供应商
             pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
             SearchFilter filter = userService.distribute();
@@ -244,11 +246,10 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（已报价）");
             PageInfo pageInfo = new PageInfo(page, size);
-//            pageInfo.filter("overdue", Constant.NO);
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("invalid", Constant.NO);
             pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -261,7 +262,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findAllByPageInfo(pageInfo, null, filter));
+            return toPage(detailService.findByPageInfo(pageInfo, null, filter));
         }
     }
 
@@ -274,10 +275,10 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.INVALID, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getInvalidInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getInvalidInquiries(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索查看收到的客户询价单（已失效）");
-            com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
+            com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<>(1));
             // 当前登录企业作为供应商
             pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
             SearchFilter filter = userService.distribute();
@@ -292,8 +293,9 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, 1L));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            // 已失效
+            pageParams.getFilters().put("id_overdue", Constant.YES);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（已失效）");
             PageInfo pageInfo = new PageInfo(page, size);
@@ -306,7 +308,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findInvalidByPageInfo(pageInfo, keyword, filter));
+            return toPage(detailService.findInvalidByPageInfo(pageInfo, keyword, filter));
         }
     }
 
@@ -319,7 +321,7 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getAgreedInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getAgreedInquiries(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索查看收到的客户询价单（已采纳）");
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -344,7 +346,7 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）");
             PageInfo pageInfo = new PageInfo(page, size);
@@ -360,7 +362,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findAllByPageInfo(pageInfo, keyword, filter));
+            return toPage(detailService.findByPageInfo(pageInfo, keyword, filter));
         }
     }
 
@@ -373,7 +375,7 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getRefusedInquiries(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getRefusedInquiries(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索查看收到的客户询价单（未采纳）");
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -395,7 +397,7 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到的客户询价单列表（未采纳）");
             PageInfo pageInfo = new PageInfo(page, size);
@@ -411,7 +413,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findAllByPageInfo(pageInfo, keyword, filter));
+            return toPage(detailService.findByPageInfo(pageInfo, keyword, filter));
         }
     }
 
@@ -424,7 +426,7 @@ public class AppInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.TEAMS, method = RequestMethod.GET)
-    public Page<PurchaseInquiryItem> getPublicInquiry(int page, int size, String keyword) {
+    public Page<PurchaseInquiryDetail> getPublicInquiry(int page, int size, String keyword) {
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索已转报价的公共询价单");
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -445,7 +447,7 @@ public class AppInquiryController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-            return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
+            return toPage(searchService.searchPurchaseInquiryDetailIds(keyword, pageParams));
         } else {
             logger.log("客户询价单", "查看收到已报价的公共询价单");
             PageInfo pageInfo = new PageInfo(page, size);
@@ -461,7 +463,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(purchaseInquiryService.findAllByPageInfo(pageInfo, null, filter));
+            return toPage(detailService.findByPageInfo(pageInfo, null, filter));
         }
     }
 

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

@@ -77,8 +77,8 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
     public SPage<PurchaseInquiryDetail> findTodoByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter) {
         // 提交状态不为1
         pageInfo.expression(PredicateUtils.or(PredicateUtils.isNull("inquiry.check"), PredicateUtils.eq("inquiry.check", Constant.NO, false)));
-        pageInfo.expression(PredicateUtils.ne("overdue", Constant.YES, false));
-        pageInfo.expression(PredicateUtils.ne("invalid", Constant.YES, false));
+        pageInfo.expression(PredicateUtils.eq("overdue", Constant.NO, false));
+        pageInfo.expression(PredicateUtils.eq("invalid", Constant.NO, false));
         return findByPageInfo(pageInfo, keyword, filter);
     }