询价上传保存时增加供应商联系人和联系电话

src/main/java/com/uas/ps/inquiry/entity/BatchInProduct.java

@@ -37,6 +37,21 @@ public class BatchInProduct {
      */
     private String bip_currency;
 
+    /**
+     * 联系人编号
+     */
+    private String bip_buyercode;
+
+    /**
+     * 联系电话
+     */
+    private String bip_mobile;
+
+    /**
+     * 联系人姓名
+     */
+    private String em_name;
+
     public Long getBip_id() {
         return bip_id;
     }
@@ -84,4 +99,28 @@ public class BatchInProduct {
     public void setBip_currency(String bip_currency) {
         this.bip_currency = bip_currency;
     }
+
+    public String getBip_buyercode() {
+        return bip_buyercode;
+    }
+
+    public void setBip_buyercode(String bip_buyercode) {
+        this.bip_buyercode = bip_buyercode;
+    }
+
+    public String getBip_mobile() {
+        return bip_mobile;
+    }
+
+    public void setBip_mobile(String bip_mobile) {
+        this.bip_mobile = bip_mobile;
+    }
+
+    public String getEm_name() {
+        return em_name;
+    }
+
+    public void setEm_name(String em_name) {
+        this.em_name = em_name;
+    }
 }

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

@@ -58,6 +58,24 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_useruu")
 	private Long userUU;
 
+    /**
+     * 联系人姓名
+     */
+    @Column(name = "id_username")
+    private String userName;
+
+    /**
+     * 联系人电话
+     */
+    @Column(name = "id_usertel")
+    private String userTel;
+
+    /**
+     * 联系人编号
+     */
+    @Column(name = "id_usercode")
+    private String userCode;
+
     /**
      * 产品id
      */
@@ -564,7 +582,31 @@ public class PublicInquiryItem implements Serializable {
 		this.userUU = userUU;
 	}
 
-	public String getBrand() {
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getBrand() {
 		return brand;
 	}
 
@@ -721,6 +763,9 @@ public class PublicInquiryItem implements Serializable {
 		this.taxrate = item.getTaxrate();
 		this.toDate = item.getToDate();
 		this.id = item.getId();
+		this.userName = item.getUserName();
+		this.userCode = item.getUserCode();
+		this.userTel = item.getUserTel();
 	}
 
 	public PublicInquiryItem() {

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

@@ -40,6 +40,24 @@ public class PurcInquiryItem {
 	@Column(name = "id_useruu")
 	private Long userUU;
 
+	/**
+	 * 联系人姓名
+	 */
+	@Column(name = "id_username")
+	private String userName;
+
+	/**
+	 * 联系人电话
+	 */
+	@Column(name = "id_usertel")
+	private String userTel;
+
+    /**
+     * 联系人编号
+     */
+	@Column(name = "id_usercode")
+    private String userCode;
+
 	/**
 	 * 产品id
 	 */
@@ -297,7 +315,47 @@ public class PurcInquiryItem {
 		this.userUU = userUU;
 	}
 
-	public Long getProductId() {
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserTel() {
+		return userTel;
+	}
+
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	public Double getUnitPrice() {
+		return unitPrice;
+	}
+
+	public void setUnitPrice(Double unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+
+	public Date getOfferTime() {
+		return offerTime;
+	}
+
+	public void setOfferTime(Date offerTime) {
+		this.offerTime = offerTime;
+	}
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public Long getProductId() {
 		return productId;
 	}
 

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

@@ -38,6 +38,24 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_useruu")
 	private Long userUU;
 
+	/**
+	 * 联系人姓名
+	 */
+	@Column(name = "id_username")
+	private String userName;
+
+	/**
+	 * 联系人电话
+	 */
+	@Column(name = "id_usertel")
+	private String userTel;
+
+	/**
+	 * 联系人编号
+	 */
+	@Column(name = "id_usercode")
+	private String userCode;
+
 	/**
 	 * 产品id
 	 */
@@ -573,6 +591,30 @@ public class PurcInquiryItemInfo {
 		this.offerTime = offerTime;
 	}
 
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserTel() {
+		return userTel;
+	}
+
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	public String getUserCode() {
+		return userCode;
+	}
+
+	public void setUserCode(String userCode) {
+		this.userCode = userCode;
+	}
+
 	public static List<PurcInquiryInfo> distinct(List<PurcInquiryItemInfo> inquiryItems) {
 		List<PurcInquiryInfo> inquiries = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();

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

@@ -209,6 +209,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             item.setSource("ERP");
                             item.setSourceid(batch.getBip_id());
                             item.setCurrency(batch.getBip_currency());
+                            item.setUserName(batch.getEm_name());
+                            item.setUserTel(batch.getBip_mobile());
+                            item.setUserCode(batch.getBip_buyercode());
                             if(null != inquiry.getBi_date()) {
                                 item.setDate(inquiry.getBi_date());
                             } else {