针对查询询价详情，如果存在物料为空的情况，从冗余字段赋值

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

@@ -1,5 +1,6 @@
 package com.uas.ps.inquiry.service.impl;
 
+import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
 import com.uas.ps.inquiry.dao.*;
 import com.uas.ps.inquiry.domain.IPage;
@@ -260,6 +261,14 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         ModelMap map = new ModelMap();
         PurcInquiryItemInfo inquiryItem = inquiryItemInfoDao.findOne(id);
         if (null != inquiryItem) {
+            if (null == inquiryItem.getProductId()) {
+                Product product = new Product();
+                product.setTitle(inquiryItem.getProdTitle());
+                product.setCmpCode(inquiryItem.getCmpCode());
+                product.setBrand(inquiryItem.getInbrand());
+                product.setSpec(inquiryItem.getSpec());
+                inquiryItem.setProduct(product);
+            }
             map.put("inquiryItem", inquiryItem);
         }
         PublicInquiryItem item = infoDao.findByVendUUAndSourceId(enuu, id);

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

@@ -421,6 +421,14 @@ public class InquiryServiceImpl implements InquiryService {
                 if (null != itemInfo.getInquiry().getEndDate()) {
                     itemInfo.setRemainingTime(itemInfo.getInquiry().getEndDate().getTime() - System.currentTimeMillis());
                 }
+                if (null == itemInfo.getProductId()) {
+                    Product product = new Product();
+                    product.setTitle(itemInfo.getProdTitle());
+                    product.setCmpCode(itemInfo.getCmpCode());
+                    product.setBrand(itemInfo.getInbrand());
+                    product.setSpec(itemInfo.getSpec());
+                    itemInfo.setProduct(product);
+                }
             }
         }
         return items;
@@ -448,6 +456,14 @@ public class InquiryServiceImpl implements InquiryService {
         if (null != itemInfo.getInquiry().getEndDate()) {
             itemInfo.setRemainingTime(itemInfo.getInquiry().getEndDate().getTime() - System.currentTimeMillis());
         }
+        if (null == itemInfo.getProductId()) {
+            Product product = new Product();
+            product.setTitle(itemInfo.getProdTitle());
+            product.setCmpCode(itemInfo.getCmpCode());
+            product.setBrand(itemInfo.getInbrand());
+            product.setSpec(itemInfo.getSpec());
+            itemInfo.setProduct(product);
+        }
         return itemInfo;
     }
 }

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

@@ -311,7 +311,20 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      */
     @Override
     public PurcInquiry findInquiryById(Long id) {
-        return purcInquiryDao.findOne(id);
+        PurcInquiry inquiry = purcInquiryDao.findOne(id);
+        if (!CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
+            for (PurcInquiryItem item : inquiry.getInquiryItems()) {
+                if (null == item.getProductId()) {
+                    Product product = new Product();
+                    product.setTitle(item.getProdTitle());
+                    product.setCmpCode(item.getCmpCode());
+                    product.setBrand(item.getInbrand());
+                    product.setSpec(item.getSpec());
+                    item.setProduct(product);
+                }
+            }
+        }
+        return inquiry;
     }
 
     /**
@@ -823,6 +836,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     itemInfo.setAttachUrl(map.get("at_path").toString());
                     itemInfo.setAttachName(map.get("at_name").toString());
                 }
+                if (null == itemInfo.getProductId()) {
+                    Product product = new Product();
+                    product.setTitle(itemInfo.getProdTitle());
+                    product.setCmpCode(itemInfo.getCmpCode());
+                    product.setBrand(itemInfo.getInbrand());
+                    product.setSpec(itemInfo.getSpec());
+                    itemInfo.setProduct(product);
+                }
             }
         }
         return IPageUtils.covert(itemInfoPage);
@@ -896,6 +917,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     itemInfo.setQuteId(item.getId());
                     itemInfo.setQuoted(Constant.YES);
                 }
+                if (null == itemInfo.getProductId()) {
+                    Product product = new Product();
+                    product.setTitle(itemInfo.getProdTitle());
+                    product.setCmpCode(itemInfo.getCmpCode());
+                    product.setBrand(itemInfo.getInbrand());
+                    product.setSpec(itemInfo.getSpec());
+                    itemInfo.setProduct(product);
+                }
             }
         }
         return IPageUtils.covert(orders);
@@ -1018,6 +1047,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             itemInfo.setQuteId(item.getId());
             itemInfo.setQuoted(Constant.YES);
         }
+        if (null == itemInfo.getProductId()) {
+            Product product = new Product();
+            product.setTitle(itemInfo.getProdTitle());
+            product.setCmpCode(itemInfo.getCmpCode());
+            product.setBrand(itemInfo.getInbrand());
+            product.setSpec(itemInfo.getSpec());
+            itemInfo.setProduct(product);
+        }
         return itemInfo;
     }