From 7f56f78fbaa4569873bccc9a5169518d79412b94 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:57:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/prod' into dev_tide_mom
---
src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java b/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java
new file mode 100644
index 0000000..ad8b812
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/dto/StaffSchedulingDto.java
@@ -0,0 +1,85 @@
+package com.ruoyi.staff.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @author buhuazhen
+ * @date 2025/9/4
+ * @email 3038525872@qq.com
+ */
+@Data
+public class StaffSchedulingDto implements Serializable {
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍛樺伐ID
+ */
+ private Integer staffId;
+
+ @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