商城添加获取单个询价单的详情

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

@@ -187,4 +187,15 @@ public class InquiryForBuyerController {
         logger.log("公共询价", "客户查询供应商报价信息", null, userUU, enUU, InquirySource.MALL.name());
         return inquiryService.findQuotationsByPage(pageInfo, searchFilter);
     }
+
+     /**
+     * 针对客户单个公共询价，查询供应商报价信息
+     * @param id
+     * @return
+     */
+    @HttpLog
+    @RequestMapping(value = "/quotation", method = RequestMethod.GET)
+    public PurcInquiryItemInfo findQuotationById(Long id) {
+        return inquiryService.findQuotationById(id);
+    }
 }

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

@@ -14,7 +14,6 @@ import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.entity.OrderStatus;
 import com.uas.ps.inquiry.model.PublicInquiryItemInfo;
 import com.uas.ps.inquiry.model.PurcInquiry;
-import com.uas.ps.inquiry.model.PurcInquiryItem;
 import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
@@ -321,6 +320,17 @@ public class PublicInquiryController {
         return publicInquiryService.findByPageInfo(pageInfo, searchFilter);
     }
 
+    /**
+     * 通过id查询单个已转报价的信息
+     * @param id
+     * @return
+     */
+    @HttpLog
+    @RequestMapping(value = "/quotation/one", method = RequestMethod.GET)
+    public PublicInquiryItemInfo getQuotationById(Long id) {
+        return  publicInquiryService.findOneInfo(id);
+    }
+
     /**
      * 商城获取采纳列表
      * @param pageInfo

src/main/java/com/uas/ps/inquiry/service/InquiryService.java

@@ -74,4 +74,11 @@ public interface InquiryService {
      * @return
      */
     Page<PurcInquiryItemInfo> findQuotationsByPage(PageInfo pageInfo, SearchFilter searchFilter);
+
+    /**
+     * 针对客户单个公共询价，查询供应商报价信息
+     * @param id
+     * @return
+     */
+    PurcInquiryItemInfo findQuotationById(Long id);
 }

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -147,6 +147,13 @@ public interface PublicInquiryService {
      */
     Page<PublicInquiryItemInfo> findByPageInfo(PageInfo info, SearchFilter filter);
 
+    /**
+     * 通过id查询单个已转报价的信息
+     * @param id
+     * @return
+     */
+    PublicInquiryItemInfo findOneInfo(Long id);
+
     /**
      * 商城获取采纳列表
      * @param info

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

@@ -3,13 +3,22 @@ package com.uas.ps.inquiry.service.impl;
 import com.uas.ps.core.util.CollectionUtils;
 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;
+import com.uas.ps.inquiry.dao.InquiryRemindDao;
+import com.uas.ps.inquiry.dao.ProductDao;
+import com.uas.ps.inquiry.dao.PublicInquiryDao;
+import com.uas.ps.inquiry.dao.PublicInquiryItemDao;
+import com.uas.ps.inquiry.dao.PurcInquiryDao;
+import com.uas.ps.inquiry.dao.PurcInquiryItemDao;
+import com.uas.ps.inquiry.dao.PurcInquiryItemInfoDao;
 import com.uas.ps.inquiry.entity.Constant;
 import com.uas.ps.inquiry.entity.InquiryDetailInfo;
 import com.uas.ps.inquiry.entity.InquiryProductInfo;
 import com.uas.ps.inquiry.entity.OrderStatus;
-import com.uas.ps.inquiry.model.*;
+import com.uas.ps.inquiry.model.PublicInquiry;
+import com.uas.ps.inquiry.model.PublicInquiryItem;
+import com.uas.ps.inquiry.model.PurcInquiry;
+import com.uas.ps.inquiry.model.PurcInquiryItem;
+import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.page.criteria.CriterionExpression;
@@ -19,18 +28,21 @@ import com.uas.ps.inquiry.page.criteria.SimpleExpression;
 import com.uas.ps.inquiry.page.exception.IllegalOperatorException;
 import com.uas.ps.inquiry.service.InquiryService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
-
 /**
  * 针对转询价报价单的数据查询操作
  *
@@ -394,4 +406,29 @@ public class InquiryServiceImpl implements InquiryService {
         }
         return items;
     }
+
+    /**
+     * 针对客户单个公共询价，查询供应商报价信息
+     * @param id
+     * @return
+     */
+    @Override
+    public PurcInquiryItemInfo findQuotationById(Long id) {
+        PurcInquiryItemInfo itemInfo = inquiryItemDao.findOne(id);
+        List<PublicInquiryItem> itemList = itemDao.findBySourceId(itemInfo.getId());
+        itemInfo.setQutations(itemList);
+        itemInfo.setAgreed(Constant.NO);
+        if (!CollectionUtils.isEmpty(itemList)) {
+            for (PublicInquiryItem i : itemList) {
+                if (i.getAgreed() != null && i.getAgreed().equals(Constant.YES)) {
+                    itemInfo.setAgreed(Constant.YES);
+                    break;
+                }
+            }
+        }
+        if (null != itemInfo.getInquiry().getEndDate()) {
+            itemInfo.setRemainingTime(itemInfo.getInquiry().getEndDate().getTime() - System.currentTimeMillis());
+        }
+        return itemInfo;
+    }
 }

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

@@ -937,4 +937,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     public PurcInquiryItemInfo findItemByItemId(Long itemId) {
         return inquiryItemInfoDao.findOne(itemId);
     }
+
+    /**
+     * 通过id查询单个已转报价的信息
+     * @param id
+     * @return
+     */
+    @Override
+    public PublicInquiryItemInfo findOneInfo(Long id) {
+        return itemInfoDao.findOne(id);
+    }
 }