From 04abe23808d72c86781c2fa9af358d93455f2bb1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 13 十一月 2025 17:35:56 +0800
Subject: [PATCH] yys 1.仓储物流增加分类管理 2.仓储物流分类管理导出接口 4.新疆生产管控定制化
---
src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java b/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java
index 6643a38..727b773 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java
@@ -1,8 +1,10 @@
package com.ruoyi.staff.dto;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
@@ -23,52 +25,69 @@
/**
* 鍛樺伐ID
*/
- private Integer staffId;
+ private String staffId;
+
+ /**
+ * 鍗堜紤鏃堕棿
+ */
+ @Excel(name = "鍗堜紤鏃堕棿")
+ private String lunchTime;
+
+ @Excel(name = "鍛樺伐鍚嶇О")
private String staffName;
+ @Excel(name = "鍛樺伐缂栧彿")
private String staffNo;
/**
* 閮ㄩ棬
*/
+ @Excel(name = "閮ㄩ棬鍚嶇О")
private String department;
/**
* 鎺掔彮绫诲瀷
*/
+ @Excel(name = "鐝鍚嶇О", readConverterExp = "1=鏃╃彮,2=涓彮,3=鏅氱彮,4=澶滅彮鐝�")
private String shiftType;
/**
* 宸ヤ綔鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "宸ヤ綔鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 20)
private Date workDate;
/**
* 寮�濮嬪伐浣滄椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "寮�濮嬪伐浣滄椂闂�", dateFormat = "mm:ss", width = 20)
private LocalDateTime workStartTime;
/**
* 缁撴潫宸ヤ綔鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "缁撴潫宸ヤ綔鏃堕棿", dateFormat = "mm:ss", width = 20)
private LocalDateTime workEndTime;
/**
* 宸ヤ綔鏃堕暱
*/
+ @Excel(name = "宸ヤ綔鏃堕暱", width = 20)
private BigDecimal workHours;
/**
* 鐘舵��
*/
+ @Excel(name = "鐘舵��", readConverterExp = "1=宸插畨鎺�,2=宸茬‘璁�,3=宸插畬鎴�,4=宸插彇娑�")
private String status;
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
private String remark;
}
--
Gitblit v1.9.3