diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java index ec40813c..baf99f2f 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java @@ -1,7 +1,6 @@ package cn.lihongjie.coal.employee.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; -import cn.lihongjie.coal.department.entity.DepartmentEntity; import cn.lihongjie.coal.employee.entity.EmpCarVO; import cn.lihongjie.coal.employee.entity.EmpCertVO; import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; @@ -58,7 +57,10 @@ public class CreateEmployeeDto extends OrgCommonDto { private List bankCardImages; @Comment("部门") - private DepartmentEntity department; + private String department; + + @Comment("岗位") + private String jobPost; @Comment("银行编码") private String bank; diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java index ad3ff1ac..46e27629 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java @@ -6,6 +6,7 @@ import cn.lihongjie.coal.employee.entity.EmpCarVO; import cn.lihongjie.coal.employee.entity.EmpCertVO; import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; import cn.lihongjie.coal.file.entity.FileEntity; +import cn.lihongjie.coal.jobPost.entity.JobPostEntity; import jakarta.persistence.ElementCollection; import jakarta.persistence.ManyToOne; @@ -78,6 +79,10 @@ public class EmployeeDto extends OrgCommonDto { @ManyToOne private DepartmentEntity department; + @Comment("岗位") + @ManyToOne + private JobPostEntity jobPost; + @Comment("银行编码") private String bank; diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java index bb71418b..b6b56085 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java @@ -1,12 +1,12 @@ package cn.lihongjie.coal.employee.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; -import cn.lihongjie.coal.department.entity.DepartmentEntity; import cn.lihongjie.coal.employee.entity.EmpCarVO; import cn.lihongjie.coal.employee.entity.EmpCertVO; import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; import jakarta.persistence.ElementCollection; +import jakarta.persistence.ManyToOne; import lombok.Data; @@ -58,7 +58,12 @@ public class UpdateEmployeeDto extends OrgCommonDto { private List bankCardImages; @Comment("部门") - private DepartmentEntity department; + private String department; + + @Comment("岗位") + @ManyToOne + private String jobPost; + @Comment("银行编码") private String bank; diff --git a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java index b4b01a29..e63ab864 100644 --- a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java +++ b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java @@ -3,6 +3,7 @@ package cn.lihongjie.coal.employee.entity; import cn.lihongjie.coal.base.entity.OrgCommonEntity; import cn.lihongjie.coal.department.entity.DepartmentEntity; import cn.lihongjie.coal.file.entity.FileEntity; +import cn.lihongjie.coal.jobPost.entity.JobPostEntity; import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; @@ -110,6 +111,10 @@ public class EmployeeEntity extends OrgCommonEntity { @ManyToOne private DepartmentEntity department; + @Comment("岗位") + @ManyToOne + private JobPostEntity jobPost; + @Comment("银行编码") private String bank;