移动返回数据格式封装，针对物料信息赋值方法更新

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

@@ -244,12 +244,12 @@ public class PublicInquiryController {
                                                     String keyword, String user_tel, Long fromDate, Long endDate) {
         ModelMap map = new ModelMap();
         PageInfo pageInfo = new PageInfo();
-        if (page == 0 || page == null) {
+        if (page == null || page == 0) {
             pageInfo.setPageNumber(1);
         } else {
             pageInfo.setPageNumber(page);
         }
-        if (size == 0 || size == null) {
+        if (size == null || size == 0) {
             pageInfo.setPageSize(5);
         } else {
             pageInfo.setPageSize(size);

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

@@ -267,6 +267,10 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 product.setCmpCode(inquiryItem.getCmpCode());
                 product.setBrand(inquiryItem.getInbrand());
                 product.setSpec(inquiryItem.getSpec());
+                product.setCode(inquiryItem.getProdCode());
+                if (inquiryItem.getProdCode() == null) {
+                    product.setCode(inquiryItem.getCmpCode());
+                }
                 inquiryItem.setProduct(product);
             }
             map.put("inquiryItem", inquiryItem);

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

@@ -892,16 +892,10 @@ 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 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};
                         SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title};
                         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));
@@ -935,13 +929,13 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     product.setCmpCode(itemInfo.getCmpCode());
                     product.setBrand(itemInfo.getInbrand());
                     product.setSpec(itemInfo.getSpec());
+                    product.setCode(itemInfo.getProdCode());
+                    if (item.getProdCode() == null) {
+                        product.setCode(itemInfo.getCmpCode());
+                    }
                     itemInfo.setProduct(product);
                 } else {
                     Product product = productDao.findOne(itemInfo.getProductId());
-                    product.setTitle(itemInfo.getProdTitle());
-                    product.setCmpCode(itemInfo.getCmpCode());
-                    product.setBrand(itemInfo.getInbrand());
-                    product.setSpec(itemInfo.getSpec());
                     itemInfo.setProduct(product);
                 }
             }