From 9ad4c5c1d7077ca9210327f73d4d57f5f425475e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 11:24:46 +0800
Subject: [PATCH] refactor(production): 优化生产计划分页查询筛选条件+生产计划去掉审核状态字段

---
 src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 13c2051..0a2c0ae 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -1,10 +1,28 @@
 package com.ruoyi.staff.dto;
 
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 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)
+    private String deptName;
+
+    @Excel(name = "宀椾綅",sort = 8)
     private String postName;
+
+    private String contractTerm;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractEndTime;
 }

--
Gitblit v1.9.3