推荐表增加品牌，询价单id以及询价方企业信息。

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

@@ -1,5 +1,7 @@
 package com.uas.ps.inquiry.model;
 
+import com.uas.ps.inquiry.entity.Inquiry;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
@@ -62,6 +64,12 @@ public class InquiryRemind implements Serializable {
     @Column(name = "ir_brand")
     private String brand;
 
+    /**
+     * 询价品牌
+     */
+    @Column(name = "ir_inbrand")
+    private String inbrand;
+
     /**
      * 原厂型号
      */
@@ -104,6 +112,19 @@ public class InquiryRemind implements Serializable {
     @Column(name = "ir_itemid")
     private Long itemId;
 
+    /**
+     * 记录来源询价单id
+     */
+    @Column(name = "ir_inid")
+    private Long inid;
+
+    /**
+     * 询价单信息
+     */
+    @OneToOne
+    @JoinColumn(name = "ir_inid", insertable = false, updatable = false)
+    private PurcInquiry inquiry;
+
     /**
      * 记录转报价后的id
      */
@@ -141,6 +162,43 @@ public class InquiryRemind implements Serializable {
     @Column(name = "ir_date")
     private Date date;
 
+    /**
+     * 剩余时间
+     */
+    @Transient
+    private Long remainingTime;
+
+    public String getInbrand() {
+        return inbrand;
+    }
+
+    public void setInbrand(String inbrand) {
+        this.inbrand = inbrand;
+    }
+
+    public Long getRemainingTime() {
+        if (null != endDate) {
+            return endDate.getTime() - System.currentTimeMillis();
+        }
+        return null;
+    }
+
+    public Long getInid() {
+        return inid;
+    }
+
+    public void setInid(Long inid) {
+        this.inid = inid;
+    }
+
+    public PurcInquiry getInquiry() {
+        return inquiry;
+    }
+
+    public void setInquiry(PurcInquiry inquiry) {
+        this.inquiry = inquiry;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -33,6 +33,13 @@ public class PurcInquiry implements Serializable {
     @Column(name = "in_enuu")
     private Long enUU;
 
+    /**
+     * 询价企业信息
+     */
+    @OneToOne
+    @JoinColumn(name = "in_enuu", insertable = false, updatable = false)
+    private Enterprise enterprise;
+
     /**
      * 企业名称（方便搜索过滤）
      */
@@ -193,6 +200,14 @@ public class PurcInquiry implements Serializable {
     @Column(name = "in_standard")
     private Integer standard;
 
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -335,10 +335,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 remind.setUserName(item.getUserName());
                                 remind.setUserTel(item.getUserTel());
                                 remind.setCode(item.getInquiry().getCode());
-                                remind.setBrand(item.getBrand());
+                                remind.setBrand(item.getInbrand());
+                                remind.setInbrand(item.getInbrand());
                                 remind.setCmpCode(item.getCmpCode());
                                 remind.setSpec(item.getSpec());
                                 remind.setTitle(item.getProdTitle());
+                                remind.setInid(item.getInquiry().getId());
                                 if (item.getProduct() != null) {
                                     remind.setBrand(item.getProduct().getBrand());
                                     remind.setCmpCode(item.getProduct().getCmpCode());