询价功能更新，UI简单调整

pom.xml

@@ -278,6 +278,12 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.uas.ps</groupId>
+            <artifactId>ps-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
         <!-- dubbo -->
         <dependency>
             <groupId>com.alibaba</groupId>

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

@@ -2,10 +2,8 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.PublicInquiryItem;
-import com.uas.platform.b2b.model.PublicInquiryItemInfo;
-import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PubInquiryService;
 import com.uas.platform.b2b.service.UserService;
@@ -24,6 +22,7 @@ import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
+import javassist.compiler.ast.Keyword;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -78,19 +77,12 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiries(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiries(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（全部）");
         PageInfo pageInfo = new PageInfo(params);
-        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setVendUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
     }
 
     /**
@@ -101,22 +93,15 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.TODO, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesTodo(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesTodo(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（待报价）");
         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);
-        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.todo.name());
     }
 
     /**
@@ -127,21 +112,14 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.END, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesEnd(PageParams params, String searchFilter) {
+    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);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.end.name());
     }
 
     /**
@@ -152,7 +130,7 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.DONE, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesDone(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesDone(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已报价）");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("overdue", Constant.NO);
@@ -161,14 +139,7 @@ public class PubInquiryController {
         pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
         pageInfo.filter("decideStatus", Status.UNAUDIT.value());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.done.name());
     }
 
     /**
@@ -179,21 +150,14 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.INVALID, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) {
+    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);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.invalid.name());
     }
 
     /**
@@ -204,7 +168,7 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.REFUSED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesRefused(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesRefused(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（未采纳）");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("agreed", Constant.NO);
@@ -212,14 +176,7 @@ public class PubInquiryController {
         pageInfo.filter("invalid", Constant.NO);
         pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.refused.name());
     }
 
     /**
@@ -230,7 +187,7 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.AGREED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已采纳）");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -238,14 +195,7 @@ public class PubInquiryController {
         pageInfo.filter("status", Status.REPLIED.value());
         pageInfo.filter("invalid", Constant.NO);
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.agreed.name());
     }
 
     /**
@@ -504,7 +454,7 @@ public class PubInquiryController {
      *
      */
     @RequestMapping(value = "/items/{itemId}/history", method = RequestMethod.GET)
-    public List<PublicInquiryItemInfo> getInquiryHistoryById(@PathVariable("itemId") Long itemId) {
+    public List<PublicInquiryItemInfo> getInquiryHistoryById(@PathVariable("itemId") Long itemId) throws Exception {
         logger.log("公共询价单", "查看历史报价信息", "查看[" + itemId+ "]的历史报价");
         return pubInquiryService.findHistoryByItemId(itemId);
     }

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.model.OrderStatus;
 import com.uas.platform.b2b.model.PublicInquiryItemInfo;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -51,12 +52,13 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiries(PageParams params, String searchFilter) {
+    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);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
     }
 
     /**
@@ -67,7 +69,7 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.TODO, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesTodo(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesTodo(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（待报价）");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("status", Status.NOT_REPLY.value());
@@ -75,7 +77,8 @@ public class PubInquiryForPurcController {
         pageInfo.filter("invalid", Constant.NO);
         pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.todo.name());
     }
 
     /**
@@ -86,14 +89,15 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.END, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesEnd(PageParams params, String searchFilter) {
+    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);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.end.name());
     }
 
     /**
@@ -104,7 +108,7 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.DONE, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesDone(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesDone(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（已报价）");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("overdue", Constant.NO);
@@ -113,7 +117,8 @@ public class PubInquiryForPurcController {
         pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         pageInfo.filter("decideStatus", Status.UNAUDIT.value());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.done.name());
     }
 
     /**
@@ -124,14 +129,15 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.INVALID, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) {
+    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);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.invalid.name());
     }
 
     /**
@@ -142,7 +148,7 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.REFUSED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesRefused(PageParams params, String searchFilter) {
+    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesRefused(PageParams params, String searchFilter) throws Exception {
         logger.log("公共询价单", "查看已转询价报价单的客户公共询价单列表（未采纳）");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("agreed", Constant.NO);
@@ -150,7 +156,8 @@ public class PubInquiryForPurcController {
         pageInfo.filter("invalid", Constant.NO);
         pageInfo.filter("inquiry.enUU", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.refused.name());
     }
 
     /**
@@ -161,7 +168,7 @@ public class PubInquiryForPurcController {
      * @return
      */
     @RequestMapping(value = "/info/nosearch", params = RequestState.AGREED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) {
+    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());
@@ -169,7 +176,8 @@ public class PubInquiryForPurcController {
         pageInfo.filter("status", Status.REPLIED.value());
         pageInfo.filter("invalid", Constant.NO);
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.agreed.name());
     }
 
 

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

@@ -79,7 +79,7 @@ public class AppPubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", method = RequestMethod.GET)
-    public Page<PublicInquiryItemInfo> getReceivedPurchaseInquiries(int page, int size, String keyword) {
+    public Page<PublicInquiryItemInfo> getReceivedPurchaseInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -112,7 +112,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(pubInquiryService.findByPageInfo(pageInfo, null, filter));
+            return toPage(pubInquiryService.findByPageInfo(pageInfo, null, filter, null));
         }
     }
 
@@ -125,7 +125,7 @@ public class AppPubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
-    public Page<PublicInquiryItemInfo> getTodoInquiries(int page, int size, String keyword) {
+    public Page<PublicInquiryItemInfo> getTodoInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -163,7 +163,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(pubInquiryService.findByPageInfo(pageInfo, null, filter));
+            return toPage(pubInquiryService.findByPageInfo(pageInfo, null, filter, null));
         }
     }
 
@@ -175,7 +175,7 @@ public class AppPubInquiryController {
      * @param keyword 关键词
      */
     @RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getEndInquiries(int page, int size, String keyword) {
+    public SPage<PublicInquiryItemInfo> getEndInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -215,7 +215,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+            return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
         }
     }
 
@@ -228,7 +228,7 @@ public class AppPubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getDoneInquiries(int page, int size, String keyword) {
+    public SPage<PublicInquiryItemInfo> getDoneInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -269,7 +269,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+            return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
         }
     }
 
@@ -281,7 +281,7 @@ public class AppPubInquiryController {
      * @param keyword 关键词
      */
     @RequestMapping(value = "/info/search", params = RequestState.INVALID, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getInvalidInquiries(int page, int size, String keyword) {
+    public SPage<PublicInquiryItemInfo> getInvalidInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -315,7 +315,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+            return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
         }
     }
 
@@ -328,7 +328,7 @@ public class AppPubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getAgreedInquiries(int page, int size, String keyword) {
+    public SPage<PublicInquiryItemInfo> getAgreedInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -369,7 +369,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+            return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
         }
     }
 
@@ -382,7 +382,7 @@ public class AppPubInquiryController {
      * @return
      */
     @RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getRefusedInquiries(int page, int size, String keyword) {
+    public SPage<PublicInquiryItemInfo> getRefusedInquiries(int page, int size, String keyword) throws Exception {
         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>());
@@ -420,7 +420,7 @@ public class AppPubInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return pubInquiryService.findByPageInfo(pageInfo, null, filter);
+            return pubInquiryService.findByPageInfo(pageInfo, null, filter, null);
         }
     }
 
@@ -441,7 +441,7 @@ public class AppPubInquiryController {
      *
      */
     @RequestMapping(value = "/items/{itemId}/history", method = RequestMethod.GET)
-    public List<PublicInquiryItemInfo> getInquiryHistoryById(@PathVariable("itemId") Long itemId) {
+    public List<PublicInquiryItemInfo> getInquiryHistoryById(@PathVariable("itemId") Long itemId) throws Exception {
         logger.log("公共询价单", "查看历史报价信息", "查看[" + itemId+ "]的历史报价");
         return pubInquiryService.findHistoryByItemId(itemId);
     }

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

@@ -0,0 +1,44 @@
+package com.uas.platform.b2b.model;
+
+/**
+ * 搜索过滤条件
+ *
+ * Created by hejq on 2018-01-19.
+ */
+public class FilterCondition {
+
+    /**
+     * 关键字
+     */
+    private String key;
+
+    /**
+     * 值
+     */
+    private String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public FilterCondition() {
+
+    }
+
+    public FilterCondition(String key, Object no) {
+        this.key = key;
+        this.value = no.toString();
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.uas.platform.b2b.model;
+
+/**
+ * 搜索过滤条件字段
+ *
+ * Created by hejq on 2018-01-19.
+ */
+public enum InquiryColumn {
+
+    /**
+     * 供应商UU
+     */
+    vendUU,
+
+    /**
+     * 状态码
+     */
+    status,
+
+    /**
+     * 客户UU
+     */
+    enUU,
+
+    /**
+     * 是否同意
+     */
+    agreed,
+
+    /**
+     * 是否失效
+     */
+    invalid,
+
+    /**
+     * 是否过期
+     */
+    overdue,
+
+    /**
+     * 审核状态
+     */
+    decideStatus
+}

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

@@ -0,0 +1,40 @@
+package com.uas.platform.b2b.model;
+
+/**
+ * 单据状态
+ *
+ * Created by hejq on 2018-01-20.
+ */
+public enum OrderStatus {
+
+    /**
+     * 待处理
+     */
+    todo,
+
+    /**
+     * 已结束
+     */
+    end,
+
+    /**
+     * 已处理
+     */
+    done,
+
+    /**
+     * 已同意
+     */
+    agreed,
+
+    /**
+     * 已拒绝
+     */
+    refused,
+
+    /**
+     * 已失效
+     */
+    invalid
+
+}

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

@@ -1,6 +1,8 @@
 package com.uas.platform.b2b.model;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.locks.Condition;
 
 /**
  * 单据查询搜索条件
@@ -64,6 +66,11 @@ public class SearchFilter {
 	 */
 	private Long userUU;
 
+	/**
+	 * 条件
+	 */
+	private List<FilterCondition> conditions;
+
 	public String getKeyword() {
 		return keyword;
 	}
@@ -136,4 +143,12 @@ public class SearchFilter {
 	public void setUserUU(Long userUU) {
 		this.userUU = userUU;
 	}
+
+    public List<FilterCondition> getConditions() {
+        return conditions;
+    }
+
+    public void setConditions(List<FilterCondition> conditions) {
+        this.conditions = conditions;
+    }
 }

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

@@ -11,7 +11,6 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.springframework.ui.ModelMap;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -24,7 +23,7 @@ public class InquiryUtils {
     /**
      * 访问地址
      */
-    private static String url = "http://localhost:8080";
+    private static String url = "http://192.168.253.192:8080";
 
     /**
      * 传递数据到公共询价接口方法
@@ -204,4 +203,25 @@ public class InquiryUtils {
         }
         return null;
     }
+
+    /**
+     * 通过分页信息查询已转报价列表
+     *
+     * @param pageInfo 分页参数
+     * @param searchFilter 过滤条件
+     * @param state 单据状态
+     * @return
+     * @throws Exception
+     */
+    public static Page<PublicInquiryItemInfo> getQuoteInfo(PageInfo pageInfo, SearchFilter searchFilter, String state) throws Exception {
+        JSONObject formData = new JSONObject();
+        formData.put("pageInfo", FlexJsonUtils.toJsonDeep(pageInfo));
+        formData.put("filter", FlexJsonUtils.toJsonDeep(searchFilter));
+        if (null != state) {
+            formData.put("_state", state);
+        }
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/public/quotation/list", formData);
+        return (Page)JSONObject.parseObject(res.getResponseText(), new TypeReference<Page<PublicInquiryItemInfo>>() {
+        }, new Feature[0]);
+    }
 }

src/main/java/com/uas/platform/b2b/service/PubInquiryService.java

@@ -34,7 +34,7 @@ public interface PubInquiryService {
      * @param filter 过滤条件
      * @return
      */
-    SPage<PublicInquiryItemInfo> findByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
+    SPage<PublicInquiryItemInfo> findByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter, String state) throws Exception;
 
     /**
      * 根据询价的id查询询价详情
@@ -50,7 +50,7 @@ public interface PubInquiryService {
      * @param itemId 明细id
      * @return
      */
-    List<PublicInquiryItemInfo> findHistoryByItemId(Long itemId);
+    List<PublicInquiryItemInfo> findHistoryByItemId(Long itemId) throws Exception;
 
     /**
      * 对公共询价单进行报价

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

@@ -262,7 +262,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	@Override
 	public ModelMap update(Product prodInfo, FileUpload uploadItem) throws Exception {
 		ModelMap map = new ModelMap();
-		if (uploadItem.getFile() != null) {// 附件存在
+		/*if (uploadItem.getFile() != null) {// 附件存在
 			Attach attach = attachService.upload(uploadItem, "productAttach", "平台客户上传物料照片或附件");
 			if (attach == null) {
 				map.put("error", "文件太大");
@@ -330,7 +330,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		prodInfo.setErpDate(new Date());
 		prodInfo = productDao.save(prodInfo);
 //		saveUserOrders(prodInfo);
-		map.put("success", "更新成功");
+		map.put("success", "更新成功");*/
 		return map;
 	}
 
@@ -340,7 +340,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	@Override
 	public ModelMap addNewProduct(Product prodInfo, FileUpload uploadItem) throws Exception {
 		ModelMap map = new ModelMap();
-		if (uploadItem.getFile() != null) {// 附件存在
+		/*if (uploadItem.getFile() != null) {// 附件存在
 			Attach attach = attachService.upload(uploadItem, "productAttach", "平台客户上传物料照片或附件");
 			if (attach == null) {
 				map.put("error", "文件太大");
@@ -389,7 +389,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 //			saveUserOrders(prodInfo);
 			map.put("id", prodInfo.getId());
 			map.put("success", "物料添加成功");
-		}
+		}*/
 		return map;
 	}
 
@@ -417,11 +417,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	public Product findById(Long id) {
 		Product product = productDao.findOne(id);
 		Integer num = productDao.findProductBusinessStatusById(id);
-		if (num > 0) {
-			product.setIsbusiness(Constant.YES);
-		} else {
-			product.setIsbusiness(Constant.NO);
-		}
+//		if (num > 0) {
+//			product.setIsbusiness(Constant.YES);
+//		} else {
+//			product.setIsbusiness(Constant.NO);
+//		}
 		return product;
 	}
 
@@ -794,7 +794,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				if (!CollectionUtils.isEmpty(vendors)) {// 有的客户供应商关系是建立交易关系存在的，不是通过搜索企业添加的
 					prodInfo.setIsPartner(PartStatus.ISVENDOR.getValue());
 				}
-				prodInfo.setAttach(product.getAttach());
+//				prodInfo.setAttach(product.getAttach());
 				prodInfo.setBrand(product.getBrand());
 				prodInfo.setCmpCode(product.getCmpCode());
 				prodInfo.setCmpUuId(product.getCmpUuId());
@@ -808,7 +808,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				prodInfo.setLeadtime(product.getLeadtime());
 				prodInfo.setLtinstock(product.getLtinstock());
 				prodInfo.setTitle(product.getTitle());
-				prodInfo.setStock(product.getStock());
+//				prodInfo.setStock(product.getStock());
 				prodInfo.setPrice(product.getPrice());
 				prodInfo.setId(product.getId());
 				prodInfos.add(prodInfo);

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

@@ -10,6 +10,7 @@ import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PubInquiryService;
 import com.uas.platform.b2b.service.RoleService;
+import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.support.XingePusher;
@@ -317,39 +318,39 @@ public class PubInquiryServiceImpl implements PubInquiryService {
      * @return
      */
     @Override
-    public SPage<PublicInquiryItemInfo> findByPageInfo(final PageInfo pageInfo, final String keyword, final SearchFilter filter) {
-        SPage<PublicInquiryItemInfo> items = new SPage<PublicInquiryItemInfo>();
-        Page<PublicInquiryItemInfo> inquiryitems = publicInquiryItemInfoDao
-                .findAll(new Specification<PublicInquiryItemInfo>() {
-                    public Predicate toPredicate(Root<PublicInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                        if (filter != null) {
-                            if (!org.springframework.util.CollectionUtils.isEmpty(filter.getDistribute()))
-                                pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
-                            if (filter.getFromDate() != null)
-                                pageInfo.expression(PredicateUtils.gte("inquiry.date", new Date(filter.getFromDate()), false));
-                            if (filter.getEndDate() != null)
-                                pageInfo.expression(PredicateUtils.lte("inquiry.date", new Date(filter.getEndDate()), false));
-                        }
-                        if (StringUtils.hasText(keyword)) {
-                            List<Object> lists = new ArrayList<>();
-                            PageParams pageParams = new PageParams();
-                            ModelMap map = new ModelMap();
-                            map.put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-                            pageParams.setFilters(map);
-                            for (PublicInquiryItemInfo list : searchService.searchPublicInquiryItemInfoIds(keyword, pageParams).getContent()) {
-                                lists.add(list.getId());
-                            }
-                            pageInfo.expression(PredicateUtils.in("id", lists, false));
-                        }
-                        return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
-                    }
-                }, pageInfo);
-        items.setContent(inquiryitems.getContent());
-        items.setPage(inquiryitems.getNumber());
-        items.setSize(inquiryitems.getSize());
-        items.setTotalElement(inquiryitems.getTotalElements());
-        items.setTotalPage(inquiryitems.getTotalPages());
-        return items;
+    public SPage<PublicInquiryItemInfo> findByPageInfo(final PageInfo pageInfo, final String keyword, final SearchFilter filter, final String state) throws Exception {
+//        SPage<PublicInquiryItemInfo> items = new SPage<PublicInquiryItemInfo>();
+//        Page<PublicInquiryItemInfo> inquiryitems = publicInquiryItemInfoDao
+//                .findAll(new Specification<PublicInquiryItemInfo>() {
+//                    public Predicate toPredicate(Root<PublicInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+//                        if (filter != null) {
+//                            if (!org.springframework.util.CollectionUtils.isEmpty(filter.getDistribute()))
+//                                pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
+//                            if (filter.getFromDate() != null)
+//                                pageInfo.expression(PredicateUtils.gte("inquiry.date", new Date(filter.getFromDate()), false));
+//                            if (filter.getEndDate() != null)
+//                                pageInfo.expression(PredicateUtils.lte("inquiry.date", new Date(filter.getEndDate()), false));
+//                        }
+//                        if (StringUtils.hasText(keyword)) {
+//                            List<Object> lists = new ArrayList<>();
+//                            PageParams pageParams = new PageParams();
+//                            ModelMap map = new ModelMap();
+//                            map.put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
+//                            pageParams.setFilters(map);
+//                            for (PublicInquiryItemInfo list : searchService.searchPublicInquiryItemInfoIds(keyword, pageParams).getContent()) {
+//                                lists.add(list.getId());
+//                            }
+//                            pageInfo.expression(PredicateUtils.in("id", lists, false));
+//                        }
+//                        return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+//                    }
+//                }, pageInfo);
+//        items.setContent(inquiryitems.getContent());
+//        items.setPage(inquiryitems.getNumber());
+//        items.setSize(inquiryitems.getSize());
+//        items.setTotalElement(inquiryitems.getTotalElements());
+//        items.setTotalPage(inquiryitems.getTotalPages());
+        return SPageUtils.covert(InquiryUtils.getQuoteInfo(pageInfo, filter, state));
     }
 
     /**
@@ -370,7 +371,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
      * @return
      */
     @Override
-    public List<PublicInquiryItemInfo> findHistoryByItemId(Long itemId) {
+    public List<PublicInquiryItemInfo> findHistoryByItemId(Long itemId) throws Exception {
         PublicInquiryItemInfo item = publicInquiryItemInfoDao.findOne(itemId);
         if (item != null) {
             final PageInfo pageInfo = new PageInfo(1, 3, 1);
@@ -378,7 +379,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
             pageInfo.filter("productId", item.getProductId());
             pageInfo.filter("status", (short) Status.REPLIED.value());
             pageInfo.sorting("inquiry.date", Sort.Direction.DESC);
-            SPage<PublicInquiryItemInfo> page = findByPageInfo(pageInfo,null,null);
+            SPage<PublicInquiryItemInfo> page = findByPageInfo(pageInfo,null,null, null);
             return page.getContent();
         }
         return null;

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

@@ -188,7 +188,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 										product.setCmpUuId(purcitem.getProdCode());
 										product.setUnit(purcitem.getUnit());
 										product.setUserUU(SystemSession.getUser().getUserUU());
-										product.setShipAddr(SystemSession.getUser().getEnterprise().getEnAddress());
+//										product.setShipAddr(SystemSession.getUser().getEnterprise().getEnAddress());
 										// 导入的物料这里没有填写规格
 										product.setSpec(purcitem.getProdTitle());
 										product = productDao.save(product);
@@ -535,7 +535,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 								product.setCmpUuId(purcitem.getProdCode());
 								product.setUnit(purcitem.getUnit());
 								product.setUserUU(SystemSession.getUser().getUserUU());
-								product.setShipAddr(SystemSession.getUser().getEnterprise().getEnAddress());
+//								product.setShipAddr(SystemSession.getUser().getEnterprise().getEnAddress());
 								product.setSpec(purcitem.getProdTitle());
 								product = productDao.save(product);
 								item.setProduct(product);

src/main/webapp/resources/js/index/app.js

@@ -5413,7 +5413,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     });
 
                     modalInstance.result.then(function (data) {
-                        $scope.item.product = data;
+                        $scope.tableParams.reload();
                     }, function () {
 
                     });
@@ -5490,7 +5490,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
                 $scope.loading = false;
                 toaster.pop('info', '提示', '报价成功');
-                $scope.tableParams.reload();
+                $modalInstance.close();
             }).error(function (data) {
                 $scope.loading = false;
                 toaster.pop('error', '附件上传失败');