卖家已报价报价列表和公共询价列表增加规格字段搜索

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

@@ -293,7 +293,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     /**
      * 根据企业UU和物料原厂型号cmpCode获取替代物料信息
      *
-     * @param enUU    企业UU
      * @param cmpCode 物料原厂型号
      * @return
      */
@@ -897,8 +896,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                 SimpleExpression code = new SimpleExpression("inquiry.code", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                 SimpleExpression title = new SimpleExpression("prodTitle", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                SimpleExpression spec = new SimpleExpression("spec", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                 SimpleExpression inquiryEnName = new SimpleExpression("inquiry.enName", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, inquiryEnName};
+                SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, inquiryEnName, spec};
                 LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
                 info.expression(logical);
             }
@@ -977,13 +977,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                         SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                         SimpleExpression title = new SimpleExpression("prodTitle", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                        SimpleExpression spec = new SimpleExpression("spec", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                         SimpleExpression code = new SimpleExpression("inquiry.code", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                         SimpleExpression enName = new SimpleExpression("inquiry.enName", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                         SimpleExpression[] simpleExpressions = null;
                         if (!StringUtils.isEmpty(filter.getIsLogin()) && filter.getIsLogin() == 0) {
-                            simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title};
+                            simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, spec};
                         } else {
-                            simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, enName};
+                            simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, enName, spec};
                         }
                         LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
                         info.expression(logical);