From 3f2d4ba07ee9e1e0ddba97b43dc70af09f0e39a2 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:40:30 +0800
Subject: [PATCH] 审核附件修改

---
 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 31d74b9..bff864a 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.dto.DateQueryDto;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -12,6 +12,7 @@
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 浜哄憳绠＄悊--鍛樺伐鍙拌处/鍚堝悓绠＄悊
@@ -66,7 +67,12 @@
      /**
      * 閮ㄩ棬
      */
-    private Integer sysDeptId;
+    private Long sysDeptId;
+
+    /**
+     * 瑙掕壊
+     */
+    private Long roleId;
 
     /**
      * 瀹跺涵浣忓潃
@@ -179,29 +185,69 @@
     private String remark;
 
 
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @Schema(description = "淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @Schema(description = "淇敼鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty(value = "绉熸埛ID")
+    @Schema(description = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    @Schema(description = "鍒悕")
+    private String alias;
 
+    @Schema(description = "鍑虹敓鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthDate;
+
+    @Schema(description = "姘戞棌")
+    private String nation;
+
+    @Schema(description = "濠氬Щ鐘跺喌")
+    private String maritalStatus;
+
+    @Schema(description = "璇曠敤鏈燂紙鏈堬級")
+    private Integer proTerm;
+
+    @Schema(description = "杞鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date positiveDate;
+
+    @Schema(description = "鍩烘湰宸ヨ祫")
+    private BigDecimal basicSalary;
+
+    @Schema(description = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
+    @TableField(exist = false)
+    private List<StaffEducation> staffEducationList;
+
+    @Schema(description = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
+    @TableField(exist = false)
+    private List<StaffWorkExperience> staffWorkExperienceList;
+
+    @Schema(description = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
+    @TableField(exist = false)
+    private List<StaffEmergencyContact> staffEmergencyContactList;
+
+
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3