商城添加采纳列表获取接口，添加剩余时间remainingTime

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

@@ -109,7 +109,7 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/item/save", method = RequestMethod.POST)
     public String saveInquiryItems(@RequestBody PublicInquiryItem item) throws Exception {
         item = saleService.saveItem(item);
-        logger.log("公共询价", "作为卖家,对公共询价进行报价操作", "sourceid: " + item.getSourceId() + ", id" + item.getId(),
+        logger.log("公共询价", "作为卖家,对公共询价进行报价操作", "sourceid: " + item.getSourceId() == null ? null : item.getSourceId() + ", id" + item.getId(),
                 item.getVendUserUU(), item.getVendUU(), item.getQutoApp());
         if (null != item) {
             return JSON.toJSONString(item.getInquiry());

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

@@ -295,6 +295,27 @@ public class PublicInquiryController {
         return  publicInquiryService.findByPageInfo(pageInfo, searchFilter);
     }
 
+    /**
+     * 商城获取采纳列表
+     * @param pageInfo
+     * @param filter
+     * @param _state
+     * @return
+     */
+    @RequestMapping(value = "/quotationList", method = RequestMethod.GET)
+    public Page<PublicInquiryItemInfo> getQuotationList(PageInfo pageInfo, String filter, String _state) {
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        if (pageInfo.getOffset() == 0) {
+            pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
+        }
+        pageInfo.setSort(sort);
+        SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
+        if (null != _state) {
+            pageInfo = publicInquiryService.covert(pageInfo, _state);
+        }
+        return  publicInquiryService.findListByPageInfo(pageInfo, searchFilter);
+    }
+
     /**
      * 获取最新的公共询价列表
      *

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItem.java

@@ -311,6 +311,12 @@ public class PurcInquiryItem {
 	@Column(name = "id_enddate")
     private Date endDate;
 
+	/**
+	 * 剩余时间
+	 */
+	@Transient
+	private Long remainingTime;
+
 	public Long getId() {
 		return id;
 	}
@@ -753,4 +759,11 @@ public class PurcInquiryItem {
                 ", endDate=" + endDate +
                 '}';
     }
+
+	public Long getRemainingTime() {
+		if (endDate != null) {
+			return endDate.getTime() - System.currentTimeMillis();
+		}
+		return null;
+	}
 }

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

@@ -139,6 +139,14 @@ public interface PublicInquiryService {
      */
     Page<PublicInquiryItemInfo> findByPageInfo(PageInfo info, SearchFilter filter);
 
+    /**
+     * 商城获取采纳列表
+     * @param info
+     * @param filter
+     * @return
+     */
+    Page<PublicInquiryItemInfo> findListByPageInfo(PageInfo info, SearchFilter filter);
+
     /**
      * 通过分页参数和过滤条件查询公共询价价信息
      * @author hejq

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

@@ -753,6 +753,16 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         }, info);
     }
 
+    @Override
+    public Page<PublicInquiryItemInfo> findListByPageInfo(final PageInfo info, SearchFilter filter) {
+        return itemInfoDao.findAll(new Specification<PublicInquiryItemInfo>() {
+            public Predicate toPredicate(Root<PublicInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+                query.where(info.getPredicates(root, query, builder));
+                return null;
+            }
+        }, info);
+    }
+
     /**
      * 查询公共询价列表信息
      *