公共询价列表增加产品名称查询；客户报价返回ERP增加附件下载

src/main/java/com/uas/ps/inquiry/entity/InquiryDetail.java

@@ -327,6 +327,7 @@ public class InquiryDetail {
             files = new ArrayList<>();
             for (com.uas.ps.inquiry.model.Attach attach : item.getAttaches()) {
                 files.add(new RemoteFile(attach));
+                id_attach = attach.getPath();
             }
         }
         if ("自动询价".equals(item.getInquiry().getRemark())) {

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

@@ -810,11 +810,18 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         info.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
                     }
                     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[] simpleExpressions = new SimpleExpression[]{cmpCode, brand};
-                        LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
-                        info.expression(logicalExpression);
+                        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 prodCmpCode = new SimpleExpression("product.cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                        SimpleExpression prodBrand = new SimpleExpression("product.brand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                        SimpleExpression code = new SimpleExpression("inquiry.code", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                        SimpleExpression prodTitle = new SimpleExpression("product.title", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
+                        SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, prodCmpCode, prodBrand, code, title, prodTitle};
+                        LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
+                        info.expression(logical);
+                        Predicate p1 = builder.equal(root.get("inquiry").get("enterprise").get("enName"), filter.getKeyword());
+                        builder.or(p1);
                     }
                 }
                 query.where(info.getPredicates(root, query, builder));