From 5611b19e904ec0daa96ea5f648500cf6205c9385 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 15:39:37 +0800
Subject: [PATCH] fix(hrm): 合并定位打卡与考勤状态功能
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 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 f5d1198..ad05c5b 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,8 +3,10 @@
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")
@Data
@@ -18,6 +20,9 @@
@Schema(description = "鍛樺伐濮撳悕", example = "闃垮崪鏉滃厠鐑湪路鍚炬媺渚濇湪")
private String employeeName;
+
+ @Schema(description = "鍛樺伐濮撳悕锛堝吋瀹规棫鐗堝鎴风锛�")
+ private String userName;
@Schema(description = "閮ㄩ棬ID", example = "131")
private Long deptId;
@@ -40,9 +45,78 @@
@Schema(description = "褰撳墠鐢熸晥鐨勮�冨嫟瑙勫垯锛屾湭閰嶇疆鏃朵负 null")
private HrmAttendanceRuleRespVO rule;
+ @Schema(description = "鑰冨嫟瑙勫垯鍚嶇О锛堝吋瀹规棫鐗堝鎴风锛�")
+ private String ruleName;
+
+ @Schema(description = "涓婄彮鏃堕棿锛堝吋瀹规棫鐗堝鎴风锛�")
+ private LocalTime workStartTime;
+
+ @Schema(description = "涓嬬彮鏃堕棿锛堝吋瀹规棫鐗堝鎴风锛�")
+ private LocalTime workEndTime;
+
+ @Schema(description = "鏄惁鍚敤瀹氫綅鑼冨洿鏍￠獙")
+ private Boolean locationRequired;
+
+ @Schema(description = "鎵撳崱鍦扮偣鍚嶇О")
+ private String locationName;
+
+ @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 = "褰撴棩鑰冨嫟璁板綍锛屾湭鎵撳崱鏃朵负 null")
private HrmAttendanceRecordRespVO record;
+ @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;
+
@Schema(description = "褰撳墠鍙墦鍗＄姸鎬�")
private Clockable clockable;
--
Gitblit v1.9.3