From 0d217eeff1f9d23844a54e8dd2ffebd8b4c2c1c7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 16:20:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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..1760ede 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;
@@ -58,8 +59,15 @@
private String nativePlace;
/**
- * 宀椾綅
+ * 閮ㄩ棬宀椾綅id
*/
+// @Excel(name = "宀椾綅")
+ private Integer deptPositionId;
+
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
private String postJob;
@@ -122,6 +130,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractExpireTime;
/**
@@ -129,6 +138,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialEndDate;
/**
@@ -136,6 +146,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialStartDate;
/**
@@ -143,6 +154,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDate;
/**
@@ -173,6 +185,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 +195,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