公共询价列表增加按客户过滤

src/main/java/com/uas/ps/inquiry/page/SearchFilter.java

@@ -60,6 +60,11 @@ public class SearchFilter {
 	 */
 	private Long userUU;
 
+	/**
+	 * 客户分配条件
+	 */
+	private Collection<?> distribute;
+
 	public String getKeyword() {
 		return keyword;
 	}
@@ -127,4 +132,11 @@ public class SearchFilter {
 		this.userUU = userUU;
 	}
 
+	public Collection<?> getDistribute() {
+		return distribute;
+	}
+
+	public void setDistribute(Collection<?> distribute) {
+		this.distribute = distribute;
+	}
 }

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

@@ -897,6 +897,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     if (filter.getEndDate() != null) {
                         info.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
                     }
+                    if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                        info.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
+                    }
                     if (!StringUtils.isEmpty(filter.getKeyword())) {
                         SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                         SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);