瀏覽代碼

员工增加社保分部

river 4 年之前
父節點
當前提交
99c0ecf121

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

@@ -54,6 +54,9 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "证件号码",required = false)
 	@ApiModelProperty(value = "证件号码",required = false)
 	private String certificateNum;
 	private String certificateNum;
 
 
+	@ApiModelProperty(value = "社保部门id",required = false)
+	private Integer depId;
+
 	@ApiModelProperty(value = "部门ids",required = false)
 	@ApiModelProperty(value = "部门ids",required = false)
 	private String depIds;
 	private String depIds;
 
 
@@ -270,4 +273,12 @@ public class Employee extends SysUser {
 	public void setPostDeptIds(String postDeptIds) {
 	public void setPostDeptIds(String postDeptIds) {
 		this.postDeptIds = postDeptIds;
 		this.postDeptIds = postDeptIds;
 	}
 	}
+
+	public Integer getDepId() {
+		return depId;
+	}
+
+	public void setDepId(Integer depId) {
+		this.depId = depId;
+	}
 }
 }

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OaServiceImpl.java

@@ -28,6 +28,7 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
         oaUser.setSex(employee.getGender().toString());
+        oaUser.setDeptId(employee.getDepId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
@@ -47,6 +48,7 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
         oaUser.setSex(employee.getGender().toString());
+        oaUser.setDeptId(employee.getDepId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));

+ 10 - 0
mec-client-api/src/main/java/com/ym/mec/oa/entity/OAUser.java

@@ -15,6 +15,8 @@ public class OAUser {
 
 
     private String sex;
     private String sex;
 
 
+    private Integer deptId;
+
     private List<Integer> deptIds;
     private List<Integer> deptIds;
 
 
     private List<Integer> postIds;
     private List<Integer> postIds;
@@ -92,4 +94,12 @@ public class OAUser {
     public void setSex(String sex) {
     public void setSex(String sex) {
         this.sex = sex;
         this.sex = sex;
     }
     }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
 }
 }