From 17a63200983a8e154a1eb3549d1caffa050372c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 17:14:45 +0800
Subject: [PATCH] feat:1.生产订单领用 2.报工领用（关联订单领用） 3.报工删除（关联报工领用） 4.不合格处理（返工生成返工附件并下载）
---
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