公共询价列表增加客户分配信息

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+
 /**
  * 公共询价接口路径
  *
@@ -190,12 +191,16 @@ public class PublicInquiryController {
      */
     @HttpLog
     @RequestMapping(method = RequestMethod.GET)
-    public IPage<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
+    public IPage<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter, String distributes) {
         Sort sort = new Sort(Sort.Direction.DESC, "id", "date");
         if (pageInfo.getOffset() == 0) {
             pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
         }
         pageInfo.setSort(sort);
+        if (!StringUtils.isEmpty(distributes)) {
+            List<Long> distribute = JSONObject.parseArray(distributes, Long.class);
+            searchFilter.setDistribute(distribute);
+        }
         logger.log("公共询价", "查询公共询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         return publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
     }

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.ps.inquiry.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
@@ -23,8 +22,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.ps.inquiry.util.FlexJsonUtils;
-import com.uas.ps.inquiry.util.HttpUtil;
 import com.uas.ps.inquiry.util.ThreadUtils;
 import javassist.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;