diff --git a/src/main/java/cn/lihongjie/coal/employee/entity/EmpFamilyMemberVO.java b/src/main/java/cn/lihongjie/coal/employee/entity/EmpFamilyMemberVO.java new file mode 100644 index 00000000..5d88f816 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/employee/entity/EmpFamilyMemberVO.java @@ -0,0 +1,45 @@ +package cn.lihongjie.coal.employee.entity; + +import jakarta.persistence.Embeddable; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +import java.util.*; + +@Data +@Embeddable +public class EmpFamilyMemberVO { + + private String name; + + @Comment("关系") + private String relation; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'emp.familyMember.relation'\n" + + " and i.code = relation)") + private String relationName; + + + private String phone; + + + private String remarks; + + + + + + + + + + +} 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 3f2ae20b..67c1dfe0 100644 --- a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java +++ b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java @@ -4,6 +4,7 @@ import cn.lihongjie.coal.base.entity.OrgCommonEntity; import cn.lihongjie.coal.department.entity.DepartmentEntity; import cn.lihongjie.coal.file.entity.FileEntity; +import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; @@ -138,4 +139,10 @@ public class EmployeeEntity extends OrgCommonEntity { + " and d.code = 'emp.status'\n" + " and i.code = emp_status)") private String empStatusName; + + + + @ElementCollection + @Comment("家庭成员") + private List familyMembers; } diff --git a/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java b/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java index 07cd8725..4c5287cb 100644 --- a/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java +++ b/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java @@ -58,4 +58,11 @@ public class EmployeeRecordEntity extends OrgCommonEntity { + " and d.code = 'archiveStatus'\n" + " and i.code = archive_status)") private String archiveStatusName; + + + + + + + }