完善人员信息

src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java

@@ -1,12 +1,14 @@
 package cn.lihongjie.coal.employee.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.department.entity.DepartmentEntity;
 
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 public class CreateEmployeeDto extends OrgCommonDto {
@@ -40,9 +42,23 @@ public class CreateEmployeeDto extends OrgCommonDto {
     @Comment("手机号")
     private String phone;
 
-    @Comment("照片")
-    private String image;
+    @Comment("身份证照片")
+    private List<String> idImages;
+
+    @Comment("银行卡照片")
+    private List<String> bankCardImages;
 
     @Comment("部门")
-    private String department;
+    private DepartmentEntity department;
+
+    @Comment("银行编码")
+    private String bank;
+
+    private String bankName;
+
+    @Comment("银行卡号")
+    private String bankCardNumber;
+
+    @Comment("收款人姓名")
+    private String bankCardName;
 }

src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java

@@ -5,13 +5,14 @@ import cn.lihongjie.coal.department.entity.DepartmentEntity;
 import cn.lihongjie.coal.file.entity.FileEntity;
 
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.OneToMany;
 
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 public class EmployeeDto extends OrgCommonDto {
@@ -57,11 +58,26 @@ public class EmployeeDto extends OrgCommonDto {
     @Comment("手机号")
     private String phone;
 
-    @Comment("照片")
-    @OneToOne
-    private FileEntity image;
+    @Comment("身份证照片")
+    @OneToMany
+    private List<FileEntity> idImages;
+
+    @Comment("银行卡照片")
+    @OneToMany
+    private List<FileEntity> bankCardImages;
 
     @Comment("部门")
     @ManyToOne
     private DepartmentEntity department;
+
+    @Comment("银行编码")
+    private String bank;
+
+    private String bankName;
+
+    @Comment("银行卡号")
+    private String bankCardNumber;
+
+    @Comment("收款人姓名")
+    private String bankCardName;
 }

src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java

@@ -1,12 +1,14 @@
 package cn.lihongjie.coal.employee.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.department.entity.DepartmentEntity;
 
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 public class UpdateEmployeeDto extends OrgCommonDto {
@@ -43,6 +45,23 @@ public class UpdateEmployeeDto extends OrgCommonDto {
     @Comment("照片")
     private String image;
 
+    @Comment("身份证照片")
+    private List<String> idImages;
+
+    @Comment("银行卡照片")
+    private List<String> bankCardImages;
+
     @Comment("部门")
-    private String department;
+    private DepartmentEntity department;
+
+    @Comment("银行编码")
+    private String bank;
+
+    private String bankName;
+
+    @Comment("银行卡号")
+    private String bankCardNumber;
+
+    @Comment("收款人姓名")
+    private String bankCardName;
 }

src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java

@@ -6,7 +6,7 @@ import cn.lihongjie.coal.file.entity.FileEntity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.OneToMany;
 
 import lombok.Data;
 
@@ -14,6 +14,7 @@ import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.Formula;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @Entity
@@ -29,7 +30,6 @@ public class EmployeeEntity extends OrgCommonEntity {
                     + "where d.id = i.dictionary_id\n"
                     + "  and d.code = 'sex'\n"
                     + "  and i.code = sex)")
-    //    @Comment("性别-名称")
     private String sexName;
 
     @Comment("民族")
@@ -42,7 +42,6 @@ public class EmployeeEntity extends OrgCommonEntity {
                     + "where d.id = i.dictionary_id\n"
                     + "  and d.code = 'nation'\n"
                     + "  and i.code = nation)")
-    //    @Comment("民族-名称")
     private String nationName;
 
     @Comment("婚姻状况")
@@ -55,7 +54,6 @@ public class EmployeeEntity extends OrgCommonEntity {
                     + "where d.id = i.dictionary_id\n"
                     + "  and d.code = 'marriage'\n"
                     + "  and i.code = marriage)")
-    //    @Comment("婚姻状况-名称")
     private String marriageName;
 
     @Comment("入职时间")
@@ -74,7 +72,6 @@ public class EmployeeEntity extends OrgCommonEntity {
                     + "where d.id = i.dictionary_id\n"
                     + "  and d.code = 'education'\n"
                     + "  and i.code = education)")
-    //    @Comment("学历-名称")
     private String educationName;
 
     @Comment("毕业学校")
@@ -89,11 +86,33 @@ public class EmployeeEntity extends OrgCommonEntity {
     @Comment("手机号")
     private String phone;
 
-    @Comment("照片")
-    @OneToOne
-    private FileEntity image;
+    @Comment("身份证照片")
+    @OneToMany
+    private List<FileEntity> idImages;
+
+    @Comment("银行卡照片")
+    @OneToMany
+    private List<FileEntity> bankCardImages;
 
     @Comment("部门")
     @ManyToOne
     private DepartmentEntity department;
+
+    @Comment("银行编码")
+    private String bank;
+
+    @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 = 'bank'\n"
+                    + "  and i.code = bank)")
+    private String bankName;
+
+    @Comment("银行卡号")
+    private String bankCardNumber;
+
+    @Comment("收款人姓名")
+    private String bankCardName;
 }