查询已转报价的数据格式进行封装处理

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

@@ -267,7 +267,7 @@ public class PublicInquiryController {
                 pageInfo.filter("overdue", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
-            } else if (_state.equals(OrderStatus.invalid)) {
+            } else if (_state.equals(OrderStatus.invalid.name())) {
                 logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("invalid", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());

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

@@ -63,6 +63,9 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
     @Autowired
     private InquiryRemindDao remindDao;
 
+    @Autowired
+    private ProductDao productDao;
+
     /**
      * 通过明细查询询价详情
      *
@@ -71,7 +74,23 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
      */
     @Override
     public PublicInquiryItem findById(Long id) {
-        return infoDao.findOne(id);
+        PublicInquiryItem item = infoDao.findOne(id);
+        if (null != item.getProductId()) {
+            Product product = productDao.findOne(item.getProductId());
+            item.setProduct(product);
+        } else {
+            Product product = new Product();
+            product.setCode(item.getProdCode());
+            product.setSpec(item.getSpec());
+            product.setTitle(item.getProdTitle());
+            product.setCmpCode(item.getCmpCode());
+            product.setBrand(item.getInbrand());
+            if (null == product.getCode()) {
+                product.setCode(item.getCmpCode());
+            }
+            item.setProduct(product);
+        }
+        return item;
     }
 
     /**

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

@@ -853,6 +853,10 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     product.setCmpCode(itemInfo.getCmpCode());
                     product.setBrand(itemInfo.getInbrand());
                     product.setSpec(itemInfo.getSpec());
+                    product.setCode(itemInfo.getProdCode());
+                    if (null == product.getCode()) {
+                        product.setCode(itemInfo.getCmpCode());
+                    }
                     itemInfo.setProduct(product);
                 }
             }