备份

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/EmployeeFiles.java

@@ -0,0 +1,55 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 文件档案管理对象 employee_files
+ *
+ * @author hdka
+ * @date 2025-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("employee_files")
+public class EmployeeFiles extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 文件ID
+     */
+    @TableId(value = "file_id")
+    private Long fileId;
+    /**
+     * 用户ID (外键)
+     */
+    private Long userId;
+    /**
+     * 文件类型(hukou,id_card,bank_card,honor_certificate,education_proof)
+     */
+    private Long fileType;
+    /**
+     * 文件名称
+     */
+    private String fileName;
+    /**
+     * 文件存储路径
+     */
+    private String filePath;
+    /**
+     * 上传时间
+     */
+    private Date uploadTime;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private Integer delFlag;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/EmployeeOnboarding.java

@@ -99,4 +99,6 @@ public class EmployeeOnboarding extends BaseEntity {
      * 紧急联系人2
      */
     private String emergencyContact2;
+
+    private Long status;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/EmployeeFilesBo.java

@@ -0,0 +1,65 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 文件档案管理业务对象 employee_files
+ *
+ * @author hdka
+ * @date 2025-03-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EmployeeFilesBo extends BaseEntity {
+
+    /**
+     * 文件ID
+     */
+    private Long fileId;
+
+    /**
+     * 用户ID (外键)
+     */
+    private Long userId;
+
+    /**
+     * 文件类型
+     */
+    private Long fileType;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件存储路径
+     */
+    private String filePath;
+
+    /**
+     * 上传时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 用户姓名
+     */
+    private String nickName;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/EmployeeOnboardingBo.java

@@ -113,4 +113,7 @@ public class EmployeeOnboardingBo extends BaseEntity {
 
     private String address;
 
+    private String nickName;
+
+    private Long status;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/EmployeeFilesVo.java

@@ -0,0 +1,53 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+
+/**
+ * 文件档案管理视图对象 employee_files
+ *
+ * @author hdka
+ * @date 2025-03-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class EmployeeFilesVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件ID
+     */
+    private Long fileId;
+
+    /**
+     * 用户ID (外键)
+     */
+    private Long userId;
+
+    /**
+     * 文件类型(hukou,id_card,bank_card,honor_certificate,education_proof)
+     */
+    private Long fileType;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件存储路径
+     */
+    private String filePath;
+
+    /**
+     * 上传时间
+     */
+    private Date uploadTime;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/EmployeeOnboardingVo.java

@@ -148,5 +148,12 @@ public class EmployeeOnboardingVo extends EmployeeOnboarding {
     /** 银行卡号 */
     private String bankCard;
 
+    /** 至今工作时间 */
+    private Long workTime;
 
+    /** 是否转正 */
+    private Long confirmStatus;
+
+
+    private Long status;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/FileUser.java

@@ -0,0 +1,31 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class FileUser extends SysUser {
+
+    /**
+     * 入职日期
+     */
+    private Date joiningDate;
+
+    /**
+     * 姓名
+     */
+    private String nickName;
+
+    /**
+     * userId
+     */
+    private Long userId;
+
+    /**
+     * 文件数
+     */
+    private Long fileTotal;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/UserFilesVo.java

@@ -0,0 +1,18 @@
+package com.ruoyi.oa.domain.vo;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UserFilesVo {
+
+    private Long userId;
+
+    private String nickName;
+
+    private String phonenumber;
+
+    private List<EmployeeFilesVo> fileList;
+}