From 43aab58c9ecb1203770ba382efbdbae299ca87ec Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 15:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java | 115 ++++++++++++++++++++-------------------------------------
1 files changed, 40 insertions(+), 75 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java
index cdacc8c..f5d1198 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java
@@ -3,100 +3,65 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.LocalTime;
-@Schema(description = "绠＄悊鍚庡彴 - 鎴戠殑浠婃棩鎵撳崱鐘舵�� Response VO")
+@Schema(description = "绠＄悊鍚庡彴 - 鎴戠殑鑰冨嫟鐘舵�� Response VO")
@Data
public class HrmAttendanceMyStatusRespVO {
- @Schema(description = "鑰冨嫟鏃ユ湡")
+ @Schema(description = "鐧诲綍鐢ㄦ埛ID", example = "464")
+ private Long userId;
+
+ @Schema(description = "鍛樺伐妗ｆID", example = "233")
+ private Long employeeId;
+
+ @Schema(description = "鍛樺伐濮撳悕", example = "闃垮崪鏉滃厠鐑湪路鍚炬媺渚濇湪")
+ private String employeeName;
+
+ @Schema(description = "閮ㄩ棬ID", example = "131")
+ private Long deptId;
+
+ @Schema(description = "閮ㄩ棬鍚嶇О", example = "閽㈢粨鏋勮溅闂�")
+ private String deptName;
+
+ @Schema(description = "鑰冨嫟鏃ユ湡", example = "2026-10-17")
private LocalDate date;
+
+ @Schema(description = "鏈嶅姟鍣ㄦ椂闂�", example = "2026-10-17 18:30:00")
+ private LocalDateTime serverTime;
@Schema(description = "鏄惁宸ヤ綔鏃�")
private Boolean workDay;
- @Schema(description = "鍛樺伐ID")
- private Long employeeId;
+ @Schema(description = "浼戞伅鏃ュ師鍥狅紝濡傦細鍥藉簡鑺傘�佸懆鍏�")
+ private String restDayReason;
- @Schema(description = "鍛樺伐濮撳悕")
- private String userName;
+ @Schema(description = "褰撳墠鐢熸晥鐨勮�冨嫟瑙勫垯锛屾湭閰嶇疆鏃朵负 null")
+ private HrmAttendanceRuleRespVO rule;
- @Schema(description = "閮ㄩ棬ID")
- private Long deptId;
+ @Schema(description = "褰撴棩鑰冨嫟璁板綍锛屾湭鎵撳崱鏃朵负 null")
+ private HrmAttendanceRecordRespVO record;
- @Schema(description = "閮ㄩ棬鍚嶇О")
- private String deptName;
+ @Schema(description = "褰撳墠鍙墦鍗＄姸鎬�")
+ private Clockable clockable;
- @Schema(description = "鑰冨嫟瑙勫垯鍚嶇О")
- private String ruleName;
+ @Schema(description = "鎵撳崱鐘舵��")
+ @Data
+ public static class Clockable {
- @Schema(description = "涓婄彮鏃堕棿")
- private LocalTime workStartTime;
+ @Schema(description = "鏄惁鍙笂鐝墦鍗�")
+ private Boolean clockIn;
- @Schema(description = "涓嬬彮鏃堕棿")
- private LocalTime workEndTime;
+ @Schema(description = "鏄惁鍙笅鐝墦鍗�")
+ private Boolean clockOut;
- @Schema(description = "鏄惁鍚敤瀹氫綅鑼冨洿鏍￠獙")
- private Boolean locationRequired;
+ @Schema(description = "涓嬩竴姝ュ姩浣滐細in-涓婄彮鎵撳崱锛宱ut-涓嬬彮鎵撳崱锛宯one-鏃犻渶鎵撳崱")
+ private String nextAction;
- @Schema(description = "鎵撳崱鍦扮偣鍚嶇О")
- private String locationName;
+ @Schema(description = "鎻愮ず鏂囨", example = "宸蹭笂鐝墦鍗★紝鍙笅鐝墦鍗�")
+ private String message;
- @Schema(description = "鎵撳崱鍦扮偣鍦板潃")
- private String locationAddress;
-
- @Schema(description = "鎵撳崱涓績缁忓害锛圵GS84锛�")
- private BigDecimal longitude;
-
- @Schema(description = "鎵撳崱涓績绾害锛圵GS84锛�")
- private BigDecimal latitude;
-
- @Schema(description = "鍏佽鎵撳崱鍗婂緞锛屽崟浣嶇背")
- private Integer radiusMeters;
-
- @Schema(description = "鍧愭爣绯�")
- private String coordinateSystem;
-
- @Schema(description = "浠婃棩璁板綍ID锛屾湭鎵撳崱鏃朵负绌�")
- private Long recordId;
-
- @Schema(description = "涓婄彮鎵撳崱鏃堕棿")
- private LocalDateTime clockInTime;
-
- @Schema(description = "涓嬬彮鎵撳崱鏃堕棿")
- private LocalDateTime clockOutTime;
-
- @Schema(description = "涓婄彮鎵撳崱绫诲瀷")
- private Integer clockInType;
-
- @Schema(description = "涓嬬彮鎵撳崱绫诲瀷")
- private Integer clockOutType;
-
- @Schema(description = "鏄惁宸蹭笂鐝墦鍗�")
- private Boolean clockInDone;
-
- @Schema(description = "鏄惁宸蹭笅鐝墦鍗�")
- private Boolean clockOutDone;
-
- @Schema(description = "鏄惁鍙笂鐝墦鍗�")
- private Boolean canClockIn;
-
- @Schema(description = "鏄惁鍙笅鐝墦鍗�")
- private Boolean canClockOut;
-
- @Schema(description = "宸ヤ綔鏃堕暱锛堝皬鏃讹級")
- private BigDecimal workHours;
-
- @Schema(description = "鍔犵彮鏃堕暱锛堝皬鏃讹級")
- private BigDecimal overtimeHours;
-
- @Schema(description = "鎵撳崱鍦扮偣")
- private String location;
-
- @Schema(description = "鏁版嵁鏉ユ簮")
- private Integer dataSource;
+ }
}
--
Gitblit v1.9.3