lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加部门和岗位

Browse Source
This commit is contained in:
lihongjie0209
2024-03-17 10:19:32 +08:00
parent a39e681e96
commit 7e93827bfd
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
View File

@@ -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<String> bankCardImages;
@Comment("部门")
private DepartmentEntity department;
private String department;
@Comment("岗位")
private String jobPost;
@Comment("银行编码")
private String bank;

5
src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
View File

@@ -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;

9
src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
View File

@@ -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<String> bankCardImages;
@Comment("部门")
private DepartmentEntity department;
private String department;
@Comment("岗位")
@ManyToOne
private String jobPost;
@Comment("银行编码")
private String bank;

5
src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java
View File

@@ -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;