From c05ba9db83838e1233a5a3787dffab0f2b88d2c8 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 07 十一月 2025 11:54:53 +0800
Subject: [PATCH] yys 劳动合同word模板导出
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index d2ce38d..0e78067 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -34,6 +35,14 @@
@NotBlank(message = "鍛樺伐鐘舵�佷笉鑳戒负绌�!!!!!!!!")
@Excel(name = "鐘舵��",readConverterExp = "0=绂昏亴,1=鍏ヨ亴")
private Integer staffState;
+
+ /**
+ * 璇曠敤鏈燂紙鏈堬級
+ */
+ @Excel(name = "璇曠敤鏈燂紙鏈堬級")
+ private Integer probationPeriod;
+
+
/**
* 鍛樺伐缂栧彿
@@ -133,6 +142,53 @@
@Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date contractEndTime;
+
+ /**
+ * 寮�濮嬭瘯鐢ㄦ棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date trialStartDate;
+
+ /**
+ * 璇曠敤缁撴潫鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璇曠敤缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date trialEndDate;
+
+ /**
+ * 绛捐鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date signDate;
+
+ /**
+ * 宸ヨ祫鎶ラ叕閫夋嫨鏉℃
+ */
+// @Excel(name = "宸ヨ祫鎶ラ叕閫夋嫨鏉℃")
+ private String salarySelect;
+
+ /**
+ * 璇曠敤鏈熷伐璧�
+ */
+ @Excel(name = "璇曠敤鏈熷伐璧�")
+ private BigDecimal proSalary;
+
+ /**
+ * 鍔冲姩鍚堝悓鏈熼檺閫夋嫨
+ */
+// @Excel(name = "鍔冲姩鍚堝悓鏈熼檺閫夋嫨")
+ private String dateSelect;
+
+ /**
+ * 澶囨敞锛堢鍒╁緟閬囷級
+ */
+ @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級")
+ private String remark;
+
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
--
Gitblit v1.9.3