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/StaffOnJob.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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..1ee4e5b 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -6,6 +6,7 @@
 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;
@@ -122,6 +123,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date contractExpireTime;
 
     /**
@@ -129,6 +131,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date trialEndDate;
 
     /**
@@ -136,6 +139,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date trialStartDate;
 
     /**
@@ -143,6 +147,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date signDate;
 
     /**
@@ -173,6 +178,8 @@
 
     @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 +188,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 = "淇敼鐢ㄦ埛")

--
Gitblit v1.9.3