From a0c2c050bfde573bc748d7bbdf732cc50e004be8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 17:23:21 +0800
Subject: [PATCH] fix: 生产计划查询未携带申请单编号
---
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 04f5169..0a2c0ae 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -2,25 +2,27 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class StaffOnJobDto extends StaffOnJob {
- @Excel(name = "宀椾綅",sort = 7)
+ @Excel(name = "閮ㄩ棬",sort = 7)
+ private String deptName;
+
+ @Excel(name = "宀椾綅",sort = 8)
private String postName;
- @Excel(name = "鍚堝悓骞撮檺")
private String contractTerm;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractEndTime;
}
--
Gitblit v1.9.3