add 员工添加字段

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -18,7 +18,7 @@ import com.ym.mec.auth.api.enums.YesOrNoEnum;
 public class SysUser implements Serializable{
 
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = -1374403507360017093L;
 
@@ -115,14 +115,14 @@ public class SysUser implements Serializable{
 
 	@ApiModelProperty(value = "微信号",required = false)
 	private String wechatId;
-	
+
 	@ApiModelProperty(value = "是否是超管",required = false)
 	private Boolean isSuperAdmin = false;
 
 	private Integer serviceTag;
 
 	private Integer operatingTag;
-	
+
 	private Integer teacherId;
 
 	@ApiModelProperty(value = "用户角色",required = false)
@@ -136,6 +136,18 @@ public class SysUser implements Serializable{
 
 	private String certificateType;
 
+	@ApiModelProperty(value = "部门id",required = false)
+	private Integer depId;
+
+	@ApiModelProperty(value = "岗位id",required = false)
+	private Integer postId;
+
+	@ApiModelProperty(value = "银行卡号",required = false)
+	private Integer bankCard;
+
+	@ApiModelProperty(value = "开户行",required = false)
+	private String openBankAddress;
+
 	public String getCertificateType() {
 		return certificateType;
 	}
@@ -422,4 +434,36 @@ public class SysUser implements Serializable{
 	public void setCurrentGradeNum(Integer currentGradeNum) {
 		this.currentGradeNum = currentGradeNum;
 	}
+
+	public Integer getDepId() {
+		return depId;
+	}
+
+	public void setDepId(Integer depId) {
+		this.depId = depId;
+	}
+
+	public Integer getPostId() {
+		return postId;
+	}
+
+	public void setPostId(Integer postId) {
+		this.postId = postId;
+	}
+
+	public Integer getBankCard() {
+		return bankCard;
+	}
+
+	public void setBankCard(Integer bankCard) {
+		this.bankCard = bankCard;
+	}
+
+	public String getOpenBankAddress() {
+		return openBankAddress;
+	}
+
+	public void setOpenBankAddress(String openBankAddress) {
+		this.openBankAddress = openBankAddress;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -17,53 +17,65 @@ public class Employee extends SysUser {
 
 	/**  */
 	private Integer userId;
-	
+
 	/**  */
 	@ApiModelProperty(value = "机构编号列表，逗号分隔",required = false)
 	private String organIdList;
-	
+
 	/** 工作性质（兼职、全职、临时） */
 	@ApiModelProperty(value = "工作性质",required = false)
 	private JobNatureEnum jobNature;
-	
+
 	/** 是否试用期(1-是 0-否) */
 	@ApiModelProperty(value = "是否试用期",required = false)
 	private YesOrNoEnum isProbationPeriod;
-	
+
 	/** 学历 */
 	@ApiModelProperty(value = "学历",required = false)
 	private String educationBackground;
-	
+
 	/** 毕业学校 */
 	@ApiModelProperty(value = "毕业学校",required = false)
 	private String graduateSchool;
-	
+
 	/** 技术职称 */
 	@ApiModelProperty(value = "技术职称",required = false)
 	private String technicalTitles;
-	
+
 	/** 入职时间 */
 	@ApiModelProperty(value = "入职时间",required = false)
 	private java.util.Date entryDate;
-	
+
 	/** 证件类型 */
 	@ApiModelProperty(value = "证件类型",required = false)
 	private String certificateType;
-	
+
 	/** 证件号码 */
 	@ApiModelProperty(value = "证件号码",required = false)
 	private String certificateNum;
-	
+
+	@ApiModelProperty(value = "部门id",required = false)
+	private Integer depId;
+
+	@ApiModelProperty(value = "岗位id",required = false)
+	private Integer postId;
+
+	@ApiModelProperty(value = "银行卡号",required = false)
+	private Integer bankCard;
+
+	@ApiModelProperty(value = "开户行",required = false)
+	private String openBankAddress;
+
 	/**  */
 	private java.util.Date updateTime;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/** 介绍 */
 	@ApiModelProperty(value = "介绍",required = false)
 	private String introduction;
-	
+
 	/** 离职日期 */
 	@ApiModelProperty(value = "离职日期",required = false)
 	private java.util.Date demissionDate;
@@ -118,79 +130,79 @@ public class Employee extends SysUser {
 	public void setEducationBackground(String educationBackground){
 		this.educationBackground = educationBackground;
 	}
-	
+
 	public String getEducationBackground(){
 		return this.educationBackground;
 	}
-			
+
 	public void setGraduateSchool(String graduateSchool){
 		this.graduateSchool = graduateSchool;
 	}
-	
+
 	public String getGraduateSchool(){
 		return this.graduateSchool;
 	}
-			
+
 	public void setTechnicalTitles(String technicalTitles){
 		this.technicalTitles = technicalTitles;
 	}
-	
+
 	public String getTechnicalTitles(){
 		return this.technicalTitles;
 	}
-			
+
 	public void setEntryDate(java.util.Date entryDate){
 		this.entryDate = entryDate;
 	}
-	
+
 	public java.util.Date getEntryDate(){
 		return this.entryDate;
 	}
-			
+
 	public void setCertificateType(String certificateType){
 		this.certificateType = certificateType;
 	}
-	
+
 	public String getCertificateType(){
 		return this.certificateType;
 	}
-			
+
 	public void setCertificateNum(String certificateNum){
 		this.certificateNum = certificateNum;
 	}
-	
+
 	public String getCertificateNum(){
 		return this.certificateNum;
 	}
-			
+
 	public void setUpdateTime(java.util.Date updateTime){
 		this.updateTime = updateTime;
 	}
-	
+
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
-	
+
 	public java.util.Date getCreateTime(){
 		return this.createTime;
 	}
-			
+
 	public void setIntroduction(String introduction){
 		this.introduction = introduction;
 	}
-	
+
 	public String getIntroduction(){
 		return this.introduction;
 	}
-			
+
 	public void setDemissionDate(java.util.Date demissionDate){
 		this.demissionDate = demissionDate;
 	}
-	
+
 	public java.util.Date getDemissionDate(){
 		return this.demissionDate;
 	}
@@ -216,4 +228,35 @@ public class Employee extends SysUser {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public Integer getDepId() {
+		return depId;
+	}
+
+	public void setDepId(Integer depId) {
+		this.depId = depId;
+	}
+
+	public Integer getPostId() {
+		return postId;
+	}
+
+	public void setPostId(Integer postId) {
+		this.postId = postId;
+	}
+
+	public Integer getBankCard() {
+		return bankCard;
+	}
+
+	public void setBankCard(Integer bankCard) {
+		this.bankCard = bankCard;
+	}
+
+	public String getOpenBankAddress() {
+		return openBankAddress;
+	}
+
+	public void setOpenBankAddress(String openBankAddress) {
+		this.openBankAddress = openBankAddress;
+	}
 }

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -23,6 +23,10 @@
         <result column="demission_date_" property="demissionDate"/>
         <result column="contact_address_" property="contactAddress"/>
         <result column="postal_code_" property="postalCode"/>
+        <result column="dept_id_" property="deptId"/>
+        <result column="post_id_" property="postId"/>
+        <result column="bank_card_" property="bankCard"/>
+        <result column="open_bank_address_" property="openBankAddress"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
@@ -156,7 +160,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM employee WHERE user_id_ = #{userId} 
+		DELETE FROM employee WHERE user_id_ = #{userId}
 	</delete>
     <delete id="delEmployeeRole">
         DELETE FROM sys_user_role WHERE user_id_ = #{userId}

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -136,6 +136,10 @@ public class EmployeeController extends BaseController {
             sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             sysUser.setContactAddress(employee.getContactAddress());
             sysUser.setPostalCode(employee.getPostalCode());
+            sysUser.setDepId(employee.getDepId());
+            sysUser.setPostId(employee.getPostId());
+            sysUser.setBankCard(employee.getBankCard());
+            sysUser.setOpenBankAddress(employee.getOpenBankAddress());
             return succeed(sysUser);
         }
         return failed("获取用户信息失败");