更新公共询价相关的接口

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

@@ -15,11 +15,14 @@ import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * 针对买家，对询价的操作
  *

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

@@ -14,34 +14,36 @@ public class SearchFilter {
 	 * 关键词
 	 */
 	private String keyword;
+
 	/**
 	 * 开始日期
 	 */
 	private Long fromDate;
+
 	/**
 	 * 结束日期
 	 */
 	private Long endDate;
+
 	/**
 	 * 开始交货日期
 	 */
 	private Long fromDelivery;
+
 	/**
 	 * 结束交货日期
 	 */
 	private Long endDelivery;
+
 	/**
 	 * 开始价格
 	 */
 	private Double fromPrice;
+
 	/**
 	 * 结束价格
 	 */
 	private Double endPrice;
-	/**
-	 * 客户分配条件
-	 */
-	private Collection<?> distribute;
 
 	/**
 	 * 供应商UU
@@ -100,12 +102,6 @@ public class SearchFilter {
 	public void setEndPrice(Double endPrice) {
 		this.endPrice = endPrice;
 	}
-	public Collection<?> getDistribute() {
-		return distribute;
-	}
-	public void setDistribute(Collection<?> distribute) {
-		this.distribute = distribute;
-	}
 
 	public Long getVendUU() {
 		return vendUU;

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

@@ -219,6 +219,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 inquiryItem.setProdCode(inquiryItem.getProduct().getCode());
             }
             inquiryItem.setVendName(enterprise.getEnName());
+            inquiryItem.setEndDate(inquiry.getEndDate());
             inquiryItem.setBusinessCode(enterprise.getBusinesscode());
             inquiryItem.setDate(new Date(System.currentTimeMillis()));
             inquiryItem.setOfferTime(new Date(System.currentTimeMillis()));

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

@@ -356,16 +356,18 @@ public class InquiryServiceImpl implements InquiryService {
     public Page<PurcInquiryItemInfo> findQuotationsByPage(final PageInfo pageInfo, final SearchFilter filter) {
         if (StringUtils.hasText(filter.getKeyword())) {
             SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
-            SimpleExpression offerAmount = new SimpleExpression("offerAmount", Constant.NO, CriterionExpression.Operator.GT);
-            SimpleExpression[] simpleExpressions = new SimpleExpression[]{offerAmount, cmpCode};
-            LogicalExpression logicalExpression = PredicateUtils.and(simpleExpressions);
-            pageInfo.expression(logicalExpression);
-        } else {
-            SimpleExpression offerAmount = new SimpleExpression("offerAmount", Constant.NO, CriterionExpression.Operator.GT);
-            SimpleExpression[] simpleExpressions = new SimpleExpression[]{offerAmount};
-            LogicalExpression logicalExpression = PredicateUtils.and(simpleExpressions);
+            SimpleExpression inbrand = new SimpleExpression("inbrand", Constant.NO, CriterionExpression.Operator.GT);
+            SimpleExpression[] simpleExpressions = new SimpleExpression[]{inbrand, cmpCode};
+            LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
             pageInfo.expression(logicalExpression);
         }
+        if (filter.getFromDate() != null) {
+            pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+        }
+        if (filter.getEndDate() != null) {
+            pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+        }
+        pageInfo.expression(PredicateUtils.gt("offerAmount", Constant.NO, false));
         Page<PurcInquiryItemInfo> items = inquiryItemDao.findAll(new Specification<PurcInquiryItemInfo>() {
             public Predicate toPredicate(Root<PurcInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 query.where(pageInfo.getPredicates(root, query, builder));

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

@@ -368,6 +368,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             item.setUserTel(batch.getBip_mobile());
                             item.setUserCode(batch.getBip_buyercode());
                             item.setOfferAmount(0);
+                            item.setEndDate(inquiry.getBi_enddate());
                             if (null != inquiry.getBi_date()) {
                                 item.setDate(inquiry.getBi_date());
                             } else {
@@ -730,11 +731,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     public Page<PublicInquiryItemInfo> findByPageInfo(final PageInfo info, final SearchFilter filter) {
         if (null != filter) {
             if (StringUtils.hasText(filter.getKeyword())) {
-                SimpleExpression title = new SimpleExpression("product.title", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression code = new SimpleExpression("product.code", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression spec = new SimpleExpression("product.spec", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression brand = new SimpleExpression("product.brand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression[] simpleExpressions = new SimpleExpression[]{title, brand, code, spec};
+                SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand};
                 LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
                 info.expression(logical);
             }
@@ -784,8 +783,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     if (!StringUtils.isEmpty(filter.getKeyword())) {
                         SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
                         SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE);
-                        SimpleExpression code = new SimpleExpression("product.cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
-                        SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, code};
+                        SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand};
                         LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
                         info.expression(logicalExpression);
                     }