From e099d0cd93c26b44bc1c10e51944edfad0465b0c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 05 三月 2026 17:44:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index a158056..cca0284 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -6,11 +6,13 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* 浜哄憳绠＄悊--鍛樺伐鍙拌处/鍚堝悓绠＄悊
@@ -30,119 +32,132 @@
/**
* 鐘舵��(0:绂昏亴;1:鍦ㄨ亴)
*/
- @Excel(name = "鐘舵��",readConverterExp = "0=绂昏亴,1=鍦ㄨ亴")
+ @Excel(name = "鐘舵��", readConverterExp = "0=绂昏亴,1=鍦ㄨ亴", sort = 1)
private Integer staffState;
/**
* 鍛樺伐缂栧彿
*/
- @Excel(name = "鍛樺伐缂栧彿", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING)
+ @Excel(name = "鍛樺伐缂栧彿", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, sort = 2)
private String staffNo;
/**
* 鍛樺伐濮撳悕
*/
- @Excel(name = "鍛樺伐濮撳悕")
+ @Excel(name = "鍛樺伐濮撳悕", sort = 3)
private String staffName;
/**
* 鎬у埆
*/
- @Excel(name = "鎬у埆")
+ @Excel(name = "鎬у埆", sort = 4)
private String sex;
/**
* 绫嶈疮
*/
- @Excel(name = "绫嶈疮")
+ @Excel(name = "绫嶈疮", sort = 5)
private String nativePlace;
/**
* 宀椾綅
*/
- @Excel(name = "宀椾綅")
- private String postJob;
+ private Integer sysPostId;
+
+ /**
+ * 閮ㄩ棬
+ */
+ private Long sysDeptId;
+
+ /**
+ * 瑙掕壊
+ */
+ private Long roleId;
/**
* 瀹跺涵浣忓潃
*/
- @Excel(name = "瀹跺涵浣忓潃")
+ @Excel(name = "瀹跺涵浣忓潃", sort = 6)
private String adress;
/**
* 绗竴瀛﹀巻
*/
- @Excel(name = "绗竴瀛﹀巻")
+ @Excel(name = "绗竴瀛﹀巻", sort = 9)
private String firstStudy;
/**
* 涓撲笟
*/
- @Excel(name = "涓撲笟")
+ @Excel(name = "涓撲笟", sort = 10)
private String profession;
/**
* 韬唤璇佸彿鐮�
*/
- @Excel(name = "韬唤璇佸彿鐮�")
+ @Excel(name = "韬唤璇佸彿鐮�", sort = 11)
private String identityCard;
/**
* 骞撮緞
*/
- @Excel(name = "骞撮緞")
+ @Excel(name = "骞撮緞", sort = 12)
private String age;
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽", sort = 13)
private String phone;
/**
* 绱ф�ヨ仈绯讳汉
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉")
+ @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 14)
private String emergencyContact;
/**
* 绱ф�ヨ仈绯讳汉鐢佃瘽
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽")
+ @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 15)
private String emergencyContactPhone;
/**
* 鍚堝悓骞撮檺
*/
- @Excel(name = "鍚堝悓骞撮檺")
+ @Excel(name = "鍚堝悓骞撮檺", sort = 16)
private String contractTerm;
/**
* 鍚堝悓鍒版湡鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 17)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractExpireTime;
/**
* 缁撴潫璇曠敤鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd", sort = 18)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialEndDate;
/**
* 寮�濮嬭瘯鐢ㄦ棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 19)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialStartDate;
/**
* 绛捐鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd", sort = 20)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDate;
/**
@@ -154,7 +169,7 @@
/**
* 璇曠敤鏈熷伐璧�
*/
- @Excel(name = "璇曠敤鏈熷伐璧�")
+ @Excel(name = "璇曠敤鏈熷伐璧�", sort = 21)
private BigDecimal proSalary;
/**
@@ -166,13 +181,14 @@
/**
* 澶囨敞锛堢鍒╁緟閬囷級
*/
- @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級")
+ @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級", sort = 22)
private String remark;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@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 = "鍒涘缓鐢ㄦ埛")
@@ -181,6 +197,8 @@
@ApiModelProperty(value = "淇敼鏃堕棿")
@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 = "淇敼鐢ㄦ埛")
@@ -191,5 +209,42 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒悕")
+ private String alias;
+
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthDate;
+
+ @ApiModelProperty(value = "姘戞棌")
+ private String nation;
+
+ @ApiModelProperty(value = "濠氬Щ鐘跺喌")
+ private String maritalStatus;
+
+ @ApiModelProperty(value = "璇曠敤鏈燂紙鏈堬級")
+ private Integer proTerm;
+
+ @ApiModelProperty(value = "杞鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date positiveDate;
+
+ @ApiModelProperty(value = "鍩烘湰宸ヨ祫")
+ private BigDecimal basicSalary;
+
+ @ApiModelProperty(value = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
+ @TableField(exist = false)
+ private List<StaffEducation> staffEducationList;
+
+ @ApiModelProperty(value = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
+ @TableField(exist = false)
+ private List<StaffWorkExperience> staffWorkExperienceList;
+
+ @ApiModelProperty(value = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
+ @TableField(exist = false)
+ private List<StaffEmergencyContact> staffEmergencyContactList;
+
}
--
Gitblit v1.9.3