1.user增加部门信息

src/main/java/com/baosight/hggp/hg/xs/domain/User.java

@@ -43,6 +43,8 @@ public class User extends DaoEPBase {
 	public static final String FIELD_PWD_REVISOR = "pwdRevisor";    		/* 密码修改人*/
 	public static final String FIELD_USER_GROUP_ENAME = "userGroupEname";    		/* 用户组*/
 	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 帐套编码*/
+	public static final String FIELD_DEP_CODE = "depCode";            /* 部门编码*/
+	public static final String FIELD_DEP_NAME = "depName";            /* 部门名称*/
 
 	public static final String COL_USER_ID = "USER_ID";    		/* 用户ID*/
 	public static final String COL_LOGIN_NAME = "LOGIN_NAME";
@@ -91,12 +93,10 @@ public class User extends DaoEPBase {
 	private String recReviseTime = " ";		/* 修改时间*/
 	private String pwdReviseDate = " ";		/* 密码修改时间*/
 	private String pwdRevisor = " ";		/* 密码修改人*/
-	private String archiveFlag = " ";		/* 归档标记*/
 	private String userGroupEname = " ";		/* 用户组*/
-	private String jobId = " ";		/* 用户岗位号*/
-	private String ehrOrgId = " ";		/* EHR组织机构代码*/
-	private String jobName = " ";		/* 用户岗位名*/
 	private String accountCode = " ";		/* 帐套编码*/
+	private String depCode = "";            /* 部门编码*/
+	private String depName = "";            /* 部门名称*/
 
 	/**
 	 * initialize the metadata.
@@ -189,6 +189,13 @@ public class User extends DaoEPBase {
 		eiColumn.setDescName("帐套编码");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_DEP_NAME);
+		eiColumn.setDescName("部门名称");
+		eiMetadata.addMeta(eiColumn);
 		
 	}
 
@@ -508,23 +515,6 @@ public class User extends DaoEPBase {
 		this.pwdRevisor = pwdRevisor;
 	}
 	/**
-	 * get the archiveFlag - 归档标记.
-	 * @return the archiveFlag
-	 */
-	public String getArchiveFlag() {
-		return this.archiveFlag;
-	}
-
-	/**
-	 * set the archiveFlag - 归档标记.
-	 *
-	 * @param archiveFlag - 归档标记
-	 */
-	@Override
-	public void setArchiveFlag(String archiveFlag) {
-		this.archiveFlag = archiveFlag;
-	}
-	/**
 	 * get the userGroupEname - 用户组.
 	 * @return the userGroupEname
 	 */
@@ -540,55 +530,8 @@ public class User extends DaoEPBase {
 	public void setUserGroupEname(String userGroupEname) {
 		this.userGroupEname = userGroupEname;
 	}
-	/**
-	 * get the jobId - 用户岗位号.
-	 * @return the jobId
-	 */
-	public String getJobId() {
-		return this.jobId;
-	}
-
-	/**
-	 * set the jobId - 用户岗位号.
-	 *
-	 * @param jobId - 用户岗位号
-	 */
-	public void setJobId(String jobId) {
-		this.jobId = jobId;
-	}
-	/**
-	 * get the ehrOrgId - EHR组织机构代码.
-	 * @return the ehrOrgId
-	 */
-	public String getEhrOrgId() {
-		return this.ehrOrgId;
-	}
 
 	/**
-	 * set the ehrOrgId - EHR组织机构代码.
-	 *
-	 * @param ehrOrgId - EHR组织机构代码
-	 */
-	public void setEhrOrgId(String ehrOrgId) {
-		this.ehrOrgId = ehrOrgId;
-	}
-	/**
-	 * get the jobName - 用户岗位名.
-	 * @return the jobName
-	 */
-	public String getJobName() {
-		return this.jobName;
-	}
-
-	/**
-	 * set the jobName - 用户岗位名.
-	 *
-	 * @param jobName - 用户岗位名
-	 */
-	public void setJobName(String jobName) {
-		this.jobName = jobName;
-	}
-	/**
 	 * get the accountCode - 帐套编码.
 	 * @return the accountCode
 	 */
@@ -604,6 +547,23 @@ public class User extends DaoEPBase {
 	public void setAccountCode(String accountCode) {
 		this.accountCode = accountCode;
 	}
+	
+	public String getDepCode() {
+		return depCode;
+	}
+	
+	public void setDepCode(String depCode) {
+		this.depCode = depCode;
+	}
+	
+	public String getDepName() {
+		return depName;
+	}
+	
+	public void setDeptName(String depName) {
+		this.depName = depName;
+	}
+	
 	/**
 	 * get the value from Map.
 	 *
@@ -633,6 +593,8 @@ public class User extends DaoEPBase {
 		setPwdRevisor(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PWD_REVISOR)), pwdRevisor));
 		setUserGroupEname(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_USER_GROUP_ENAME)), userGroupEname));
 		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		setDeptName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_NAME)), depName));
 	}
 
 	/**
@@ -663,6 +625,8 @@ public class User extends DaoEPBase {
 		map.put(FIELD_PWD_REVISOR, StringUtils.toString(pwdRevisor, eiMetadata.getMeta(FIELD_PWD_REVISOR)));
 		map.put(FIELD_USER_GROUP_ENAME, StringUtils.toString(userGroupEname, eiMetadata.getMeta(FIELD_USER_GROUP_ENAME)));
 		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+		map.put(FIELD_DEP_NAME, StringUtils.toString(depName, eiMetadata.getMeta(FIELD_DEP_NAME)));
 		
 		return map;
 	}