Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/dao/RouteSetDao.java

@@ -0,0 +1,23 @@
+package com.uas.platform.b2b.dao;
+
+import com.uas.platform.b2b.model.RouteSet;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 访问路径数据库操作
+ *
+ * Created by hejq on 2018-01-24.
+ */
+@Repository
+public interface RouteSetDao extends JpaSpecificationExecutor<RouteSet>, JpaRepository<RouteSet, Long> {
+
+    /**
+     * 通过编号查询相关信息
+     *
+     * @param code 服务编号
+     * @return
+     */
+    RouteSet findByCode(String code);
+}

src/main/java/com/uas/platform/b2b/model/PublicInquiryItem.java

@@ -60,6 +60,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;
+
 	/**
 	 * 产品
 	 */
@@ -515,7 +533,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;
 	}
 

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -51,6 +51,24 @@ public class PurchaseInquiryItem {
 	@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;
+
 	/**
 	 * 产品
 	 */
@@ -604,7 +622,31 @@ public class PurchaseInquiryItem {
 		this.kind = kind;
 	}
 
-	/**
+    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;
+    }
+
+    /**
 	 * 回复记录的描述
 	 * 
 	 * @return

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItemInfo.java

@@ -70,6 +70,24 @@ public class PurchaseInquiryItemInfo {
 	@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;
+
 	/**
 	 * 产品
 	 */
@@ -546,6 +564,30 @@ public class PurchaseInquiryItemInfo {
 		this.invalid = invalid;
 	}
 
+	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;
+	}
+
 	/**
 	 * 回复记录的描述
 	 * 

src/main/java/com/uas/platform/b2b/model/RouteSet.java

@@ -0,0 +1,78 @@
+package com.uas.platform.b2b.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 各访问地址信息
+ *
+ * Created by hejq on 2018-01-24.
+ */
+@Table(name = "routeset")
+@Entity
+public class RouteSet implements Serializable {
+
+    /**
+     * 序列
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "routeset_gen")
+    @SequenceGenerator(name = "routeset_gen", sequenceName = "routeset_seq", allocationSize = 1)
+    @Column(name = "ro_id")
+    private Long id;
+
+    /**
+     * 编号
+     */
+    @Column(name = "ro_code")
+    private String code;
+
+    /**
+     * 说明
+     */
+    @Column(name = "ro_des")
+    private String des;
+
+    /**
+     * 访问地址
+     */
+    @Column(name = "ro_url")
+    private String url;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
+    public void setDes(String des) {
+        this.des = des;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -342,14 +342,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 	public List<DeputyOrder> findByDeputyuu(Long enuu) {
 		String entryStatus = "已提交";
 		String downloadStatus = "未下载";
-		List<Long> idList = new ArrayList<Long>();
-		idList.add(5351L);
-		idList.add(5349L);
-		idList.add(5347L);
-		idList.add(5346L);
-		idList.add(5343L);
-		return deputyOrderDao.findAll(idList);
-//		return deputyOrderDao.getByDeputyuuAndEntrystatusAndDownloadstatus(enuu, entryStatus, downloadStatus);
+		return deputyOrderDao.getByDeputyuuAndEntrystatusAndDownloadstatus(enuu, entryStatus, downloadStatus);
 	}
 
 	@Override