【后台】+【user模型和Distribute】+【为user添加显示是否被分配字段，为distribute模型添加管理user】

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2508 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -51,6 +51,13 @@ public class Distribute implements Serializable {
 	 */
 	@Column(name = "pd_useruu")
 	private Long userUU;
+	
+	/**
+	 * 关联user
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH,CascadeType.MERGE })
+	@JoinColumn(name = "pd_useruu", insertable = false, updatable = false)
+	private User user;
 
 	public Long getId() {
 		return id;
@@ -84,4 +91,12 @@ public class Distribute implements Serializable {
 		this.userUU = userUU;
 	}
 
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
 }

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

@@ -113,6 +113,12 @@ public class User implements Serializable {
 	@Transient
 	@NotFound(action = NotFoundAction.IGNORE)
 	private String ip;
+	
+	/**
+	 * 判断是否被分配
+	 */
+	@Transient
+	private boolean distribute;
 
 	public Long getUserUU() {
 		return userUU;
@@ -297,6 +303,14 @@ public class User implements Serializable {
 		this.ip = ip;
 	}
 	
+	public boolean getDistribute() {
+		return distribute;
+	}
+
+	public void setDistribute(boolean distribute) {
+		this.distribute = distribute;
+	}
+
 	/**
 	 * 获取用户所属企业UU号
 	 * @return