From 196ff11a9b7e514dabea8757de00259d9b7fea4d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 08:42:59 +0800
Subject: [PATCH] feat(hrm): 同步考勤打卡能力到新高电力

---
 yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/HrmAttendanceClockTypeEnum.java                       |   15 ++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java  |   43 ++++--
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java              |   10 +
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java |   67 +++++++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java          |  166 +++++++++++++++++++++++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceRuleMapper.java               |   12 ++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java            |   25 +++-
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java   |    6 +
 8 files changed, 323 insertions(+), 21 deletions(-)

diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/HrmAttendanceClockTypeEnum.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/HrmAttendanceClockTypeEnum.java
index ee77e9f..99bd961 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/HrmAttendanceClockTypeEnum.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/HrmAttendanceClockTypeEnum.java
@@ -28,4 +28,19 @@
         return ARRAYS;
     }
 
+    /**
+     * 鏍规嵁绫诲瀷鑾峰彇鍚嶇О锛屾湭鐭ョ被鍨嬭繑鍥� null
+     */
+    public static String getNameByType(Integer type) {
+        if (type == null) {
+            return null;
+        }
+        for (HrmAttendanceClockTypeEnum value : values()) {
+            if (value.getType().equals(type)) {
+                return value.getName();
+            }
+        }
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 9f94ad3..2313305 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -7,12 +7,14 @@
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
 import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportExcelVO;
 import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportReqVO;
 import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
 import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordRespVO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceClockTypeEnum;
 import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceRecordService;
 import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -25,11 +27,13 @@
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -37,6 +41,7 @@
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.EMPLOYEE_NOT_EXISTS;
 
 @Tag(name = "绠$悊鍚庡彴 - HRM 鑰冨嫟璁板綍")
@@ -56,36 +61,46 @@
 
     @PostMapping("/clock-in")
     @Operation(summary = "涓婄彮鎵撳崱")
-    @PreAuthorize("@ss.hasPermission('hrm:attendance:clock')")
     public CommonResult<HrmAttendanceRecordRespVO> clockIn(@RequestParam("location") String location) {
         Long loginUserId = getLoginUserId();
         HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
         if (employee == null) {
-            throw exception(EMPLOYEE_NOT_EXISTS, "褰撳墠鐢ㄦ埛鏈叧鑱斿憳宸ヤ俊鎭紝鏃犳硶鎵撳崱");
+            throw exception(EMPLOYEE_NOT_EXISTS,
+                    "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
         }
         HrmAttendanceRecordDO record = attendanceRecordService.clockIn(employee.getId(), LocalDateTime.now(), location);
-        HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(record, HrmAttendanceRecordRespVO.class);
-        respVO.setUserName(employee.getName());
-        if (record.getDeptId() != null) {
-            DeptRespDTO dept = deptApi.getDept(record.getDeptId());
-            if (dept != null) {
-                respVO.setDeptName(dept.getName());
-            }
-        }
-        return success(respVO);
+        return success(buildClockRespVO(record, employee));
     }
 
     @PostMapping("/clock-out")
     @Operation(summary = "涓嬬彮鎵撳崱")
-    @PreAuthorize("@ss.hasPermission('hrm:attendance:clock')")
     public CommonResult<HrmAttendanceRecordRespVO> clockOut(@RequestParam("location") String location) {
         Long loginUserId = getLoginUserId();
         HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
         if (employee == null) {
-            throw exception(EMPLOYEE_NOT_EXISTS, "褰撳墠鐢ㄦ埛鏈叧鑱斿憳宸ヤ俊鎭紝鏃犳硶鎵撳崱");
+            throw exception(EMPLOYEE_NOT_EXISTS,
+                    "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
         }
         HrmAttendanceRecordDO record = attendanceRecordService.clockOut(employee.getId(), LocalDateTime.now(), location);
+        return success(buildClockRespVO(record, employee));
+    }
+
+    @GetMapping("/my-status")
+    @Operation(summary = "鑾峰緱褰撳墠鐧诲綍浜虹殑鑰冨嫟鐘舵��")
+    @Parameter(name = "date", description = "鑰冨嫟鏃ユ湡锛屾牸寮� yyyy-MM-dd锛岄粯璁ゆ湇鍔″櫒褰撳ぉ", example = "2026-10-17")
+    public CommonResult<HrmAttendanceMyStatusRespVO> getMyStatus(
+            @RequestParam(value = "date", required = false)
+            @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) LocalDate date) {
+        return success(attendanceRecordService.getMyStatus(getLoginUserId(), date));
+    }
+
+    /**
+     * 鏋勫缓鎵撳崱杩斿洖 VO锛屽瓧娈典笌 my-status.record 淇濇寔涓�鑷�
+     */
+    private HrmAttendanceRecordRespVO buildClockRespVO(HrmAttendanceRecordDO record, HrmEmployeeDO employee) {
         HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(record, HrmAttendanceRecordRespVO.class);
+        respVO.setClockInTypeName(HrmAttendanceClockTypeEnum.getNameByType(record.getClockInType()));
+        respVO.setClockOutTypeName(HrmAttendanceClockTypeEnum.getNameByType(record.getClockOutType()));
         respVO.setUserName(employee.getName());
         if (record.getDeptId() != null) {
             DeptRespDTO dept = deptApi.getDept(record.getDeptId());
@@ -93,7 +108,7 @@
                 respVO.setDeptName(dept.getName());
             }
         }
-        return success(respVO);
+        return respVO;
     }
 
     private Long getLoginUserId() {
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
new file mode 100644
index 0000000..f5d1198
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceMyStatusRespVO.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 鎴戠殑鑰冨嫟鐘舵�� Response VO")
+@Data
+public class HrmAttendanceMyStatusRespVO {
+
+    @Schema(description = "鐧诲綍鐢ㄦ埛ID", example = "464")
+    private Long userId;
+
+    @Schema(description = "鍛樺伐妗f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 = "浼戞伅鏃ュ師鍥狅紝濡傦細鍥藉簡鑺傘�佸懆鍏�")
+    private String restDayReason;
+
+    @Schema(description = "褰撳墠鐢熸晥鐨勮�冨嫟瑙勫垯锛屾湭閰嶇疆鏃朵负 null")
+    private HrmAttendanceRuleRespVO rule;
+
+    @Schema(description = "褰撴棩鑰冨嫟璁板綍锛屾湭鎵撳崱鏃朵负 null")
+    private HrmAttendanceRecordRespVO record;
+
+    @Schema(description = "褰撳墠鍙墦鍗$姸鎬�")
+    private Clockable clockable;
+
+    @Schema(description = "鎵撳崱鐘舵��")
+    @Data
+    public static class Clockable {
+
+        @Schema(description = "鏄惁鍙笂鐝墦鍗�")
+        private Boolean clockIn;
+
+        @Schema(description = "鏄惁鍙笅鐝墦鍗�")
+        private Boolean clockOut;
+
+        @Schema(description = "涓嬩竴姝ュ姩浣滐細in-涓婄彮鎵撳崱锛宱ut-涓嬬彮鎵撳崱锛宯one-鏃犻渶鎵撳崱")
+        private String nextAction;
+
+        @Schema(description = "鎻愮ず鏂囨", example = "宸蹭笂鐝墦鍗★紝鍙笅鐝墦鍗�")
+        private String message;
+
+    }
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
index 7b91afa..aa44d1e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
@@ -55,11 +55,17 @@
     @DictFormat("hrm_clock_type")
     private Integer clockInType;
 
+    @Schema(description = "涓婄彮鎵撳崱绫诲瀷鍚嶇О", example = "姝e父")
+    private String clockInTypeName;
+
     @Schema(description = "涓嬬彮鎵撳崱绫诲瀷")
     @ExcelProperty(value = "涓嬬彮鎵撳崱绫诲瀷", converter = DictConvert.class)
     @DictFormat("hrm_clock_type")
     private Integer clockOutType;
 
+    @Schema(description = "涓嬬彮鎵撳崱绫诲瀷鍚嶇О", example = "鏃╅��")
+    private String clockOutTypeName;
+
     @Schema(description = "宸ヤ綔鏃堕暱锛堝皬鏃讹級")
     @ExcelProperty("宸ヤ綔鏃堕暱")
     private BigDecimal workHours;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceRuleMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceRuleMapper.java
index a22c23b..25a3073 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceRuleMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceRuleMapper.java
@@ -37,4 +37,16 @@
                 .orderByAsc(HrmAttendanceRuleDO::getName));
     }
 
+    /**
+     * 鏌ヨ閮ㄩ棬涓嬪凡鍚敤鐨勮鍒欙紝鏈�鏂板垱寤虹殑鎺掑湪鍓嶉潰
+     *
+     * 鍚屼竴閮ㄩ棬瀛樺湪澶氭潯鍚敤瑙勫垯鏃讹紝浠ユ渶鏂板垱寤虹殑涓�鏉′负褰撳墠鐢熸晥瑙勫垯
+     */
+    default List<HrmAttendanceRuleDO> selectEnabledListByDeptId(Long deptId) {
+        return selectList(new LambdaQueryWrapperX<HrmAttendanceRuleDO>()
+                .eq(HrmAttendanceRuleDO::getDeptId, deptId)
+                .eq(HrmAttendanceRuleDO::getStatus, 0)
+                .orderByDesc(HrmAttendanceRuleDO::getId));
+    }
+
 }
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
index cf8db2d..e926eea 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.hrm.service.attendance;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
 import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
@@ -37,6 +38,15 @@
      */
     HrmAttendanceRecordDO getAttendanceRecordByUserIdAndDate(Long userId, LocalDate date);
 
+    /**
+     * 鑾峰緱褰撳墠鐧诲綍浜虹殑鑰冨嫟鐘舵�侊細鑰冨嫟瑙勫垯 + 鎸囧畾鏃ユ湡鐨勬墦鍗$姸鎬�
+     *
+     * @param loginUserId 鐧诲綍鐢ㄦ埛ID锛堢郴缁熺敤鎴稩D锛屼笉鏄憳宸D锛�
+     * @param date        鑰冨嫟鏃ユ湡锛屼负绌烘椂鍙栨湇鍔″櫒褰撳ぉ
+     * @return 鎴戠殑鑰冨嫟鐘舵��
+     */
+    HrmAttendanceMyStatusRespVO getMyStatus(Long loginUserId, LocalDate date);
+
     /** 鍒涘缓瀵煎叆鐨勮�冨嫟璁板綍 */
     void createImportedRecord(HrmAttendanceRecordDO record);
 
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index 76a5fb3..ea112f1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -2,7 +2,11 @@
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
 import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleRespVO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceHolidayDO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
@@ -11,7 +15,10 @@
 import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceClockTypeEnum;
 import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceDataSourceEnum;
 import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceExceptionTypeEnum;
+import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceHolidayTypeEnum;
 import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +26,7 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.DayOfWeek;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -45,6 +53,8 @@
     private HrmAttendanceRuleService attendanceRuleService;
     @Resource
     private HrmAttendanceHolidayService attendanceHolidayService;
+    @Resource
+    private DeptApi deptApi;
 
     @Override
     public PageResult<HrmAttendanceRecordDO> getAttendanceRecordPage(HrmAttendanceRecordPageReqVO pageReqVO) {
@@ -67,6 +77,162 @@
     }
 
     @Override
+    public HrmAttendanceMyStatusRespVO getMyStatus(Long loginUserId, LocalDate date) {
+        LocalDate queryDate = date != null ? date : LocalDate.now();
+        // 1. 鐧诲綍鐢ㄦ埛 -> 鍛樺伐妗f
+        HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
+        if (employee == null) {
+            throw exception(EMPLOYEE_NOT_EXISTS,
+                    "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+        }
+        HrmAttendanceMyStatusRespVO respVO = new HrmAttendanceMyStatusRespVO();
+        respVO.setUserId(loginUserId);
+        respVO.setEmployeeId(employee.getId());
+        respVO.setEmployeeName(employee.getName());
+        respVO.setDeptId(employee.getDeptId());
+        if (employee.getDeptId() != null) {
+            DeptRespDTO dept = deptApi.getDept(employee.getDeptId());
+            if (dept != null) {
+                respVO.setDeptName(dept.getName());
+            }
+        }
+        respVO.setDate(queryDate);
+        respVO.setServerTime(LocalDateTime.now());
+
+        // 2. 鏄惁宸ヤ綔鏃� + 浼戞伅鍘熷洜
+        boolean workDay = attendanceHolidayService.isWorkDay(queryDate);
+        respVO.setWorkDay(workDay);
+        if (!workDay) {
+            respVO.setRestDayReason(getRestDayReason(queryDate));
+        }
+
+        // 3. 褰撳墠鐢熸晥瑙勫垯锛堥儴闂ㄨ鍒欎紭鍏堬紝鍏舵鍏ㄥ眬瑙勫垯锛�
+        HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(employee.getDeptId());
+        if (rule != null) {
+            HrmAttendanceRuleRespVO ruleRespVO = BeanUtils.toBean(rule, HrmAttendanceRuleRespVO.class);
+            if (rule.getDeptId() != null) {
+                DeptRespDTO ruleDept = deptApi.getDept(rule.getDeptId());
+                if (ruleDept != null) {
+                    ruleRespVO.setDeptName(ruleDept.getName());
+                }
+            }
+            respVO.setRule(ruleRespVO);
+        }
+
+        // 4. 褰撴棩鑰冨嫟璁板綍
+        HrmAttendanceRecordDO record = attendanceRecordMapper.selectByUserIdAndDate(employee.getId(), queryDate);
+        if (record != null) {
+            respVO.setRecord(buildRecordRespVO(record, employee));
+        }
+
+        // 5. 褰撳墠鍙墦鍗$姸鎬�
+        respVO.setClockable(buildClockable(workDay, rule, record, queryDate));
+        return respVO;
+    }
+
+    /**
+     * 浼戞伅鏃ュ師鍥狅細浼樺厛鍙栬妭鍋囨棩閰嶇疆鍚嶇О锛屾湭閰嶇疆鏃舵寜鏄熸湡缁欏嚭鈥滃懆鍏�/鍛ㄦ棩鈥�
+     */
+    private String getRestDayReason(LocalDate date) {
+        List<HrmAttendanceHolidayDO> holidays = attendanceHolidayService.getAttendanceHolidayListByDateRange(date, date);
+        for (HrmAttendanceHolidayDO holiday : holidays) {
+            if (HrmAttendanceHolidayTypeEnum.REST_DAY.getType().equals(holiday.getType())) {
+                return holiday.getName();
+            }
+        }
+        DayOfWeek dayOfWeek = date.getDayOfWeek();
+        if (dayOfWeek == DayOfWeek.SATURDAY) {
+            return "鍛ㄥ叚";
+        }
+        if (dayOfWeek == DayOfWeek.SUNDAY) {
+            return "鍛ㄦ棩";
+        }
+        return null;
+    }
+
+    /**
+     * 鏋勫缓鎵撳崱璁板綍杩斿洖 VO锛岃ˉ榻愭墦鍗$被鍨嬪悕绉般�佸憳宸ヤ笌閮ㄩ棬淇℃伅
+     */
+    private HrmAttendanceRecordRespVO buildRecordRespVO(HrmAttendanceRecordDO record, HrmEmployeeDO employee) {
+        HrmAttendanceRecordRespVO recordRespVO = BeanUtils.toBean(record, HrmAttendanceRecordRespVO.class);
+        recordRespVO.setClockInTypeName(HrmAttendanceClockTypeEnum.getNameByType(record.getClockInType()));
+        recordRespVO.setClockOutTypeName(HrmAttendanceClockTypeEnum.getNameByType(record.getClockOutType()));
+        if (employee != null) {
+            recordRespVO.setUserName(employee.getName());
+            recordRespVO.setPhone(employee.getPhone());
+        }
+        if (record.getDeptId() != null) {
+            DeptRespDTO dept = deptApi.getDept(record.getDeptId());
+            if (dept != null) {
+                recordRespVO.setDeptName(dept.getName());
+            }
+        }
+        return recordRespVO;
+    }
+
+    /**
+     * 鏍规嵁宸ヤ綔鏃ャ�佽�冨嫟瑙勫垯涓庡綋鏃ヨ褰曡绠楀彲鎵撳崱鐘舵��
+     */
+    private HrmAttendanceMyStatusRespVO.Clockable buildClockable(boolean workDay, HrmAttendanceRuleDO rule,
+                                                                 HrmAttendanceRecordDO record, LocalDate date) {
+        HrmAttendanceMyStatusRespVO.Clockable clockable = new HrmAttendanceMyStatusRespVO.Clockable();
+        if (!workDay) {
+            clockable.setClockIn(false);
+            clockable.setClockOut(false);
+            clockable.setNextAction("none");
+            clockable.setMessage("浠婃棩浼戞伅锛屾棤闇�鎵撳崱");
+            return clockable;
+        }
+        if (rule == null) {
+            clockable.setClockIn(false);
+            clockable.setClockOut(false);
+            clockable.setNextAction("none");
+            clockable.setMessage("鏈厤缃�冨嫟瑙勫垯锛岃鑱旂郴绠$悊鍛�");
+            return clockable;
+        }
+        // 鍙湁涓嬬彮鍗°�佹病鏈変笂鐝崱锛氬綋鏃ュ凡缁撴潫锛屼笉鍐嶅厑璁哥户缁墦鍗�
+        if (record != null && record.getClockInTime() == null && record.getClockOutTime() != null) {
+            clockable.setClockIn(false);
+            clockable.setClockOut(false);
+            clockable.setNextAction("none");
+            clockable.setMessage("浠婃棩缂轰笂鐝崱锛屽凡瀹屾垚涓嬬彮鎵撳崱");
+            return clockable;
+        }
+        // 浠婂ぉ杩樻病鎵撲笂鐝崱
+        if (record == null || record.getClockInTime() == null) {
+            clockable.setClockIn(true);
+            clockable.setClockOut(false);
+            clockable.setNextAction("in");
+            clockable.setMessage("鍙笂鐝墦鍗�");
+            // 浠呭綋澶╂煡璇㈡椂鎻愮ず宸茶繜鍒版椂闀�
+            LocalDateTime now = LocalDateTime.now();
+            if (rule.getWorkStartTime() != null && date.equals(now.toLocalDate())) {
+                LocalDateTime workStart = LocalDateTime.of(date, rule.getWorkStartTime());
+                int lateAllowMinutes = rule.getLateAllowMinutes() != null ? rule.getLateAllowMinutes() : 0;
+                if (now.isAfter(workStart.plusMinutes(lateAllowMinutes))) {
+                    long lateMinutes = Duration.between(workStart, now).toMinutes();
+                    clockable.setMessage("宸茶秴杩囦笂鐝椂闂� " + lateMinutes + " 鍒嗛挓");
+                }
+            }
+            return clockable;
+        }
+        // 宸叉墦涓婄彮鍗°�佹湭鎵撲笅鐝崱
+        if (record.getClockOutTime() == null) {
+            clockable.setClockIn(false);
+            clockable.setClockOut(true);
+            clockable.setNextAction("out");
+            clockable.setMessage("宸蹭笂鐝墦鍗★紝鍙笅鐝墦鍗�");
+            return clockable;
+        }
+        // 涓婁笅鐝崱閮藉凡鎵�
+        clockable.setClockIn(false);
+        clockable.setClockOut(false);
+        clockable.setNextAction("none");
+        clockable.setMessage("浠婃棩宸插畬鎴愭墦鍗�");
+        return clockable;
+    }
+
+    @Override
     public void createImportedRecord(HrmAttendanceRecordDO record) {
         // 鎸夎�冨嫟瑙勫垯閲嶇畻鎵撳崱绫诲瀷涓庢椂闀匡紝涓嶄俊浠� Excel 濉啓鐨勫��
         fillClockTypes(record);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
index 9ca16f8..c5c2bab 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
@@ -20,9 +20,11 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -136,17 +138,26 @@
 
     @Override
     public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId) {
-        // 1. 鍏堟煡鎵鹃儴闂ㄤ笓灞炶鍒�
-        List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectList(new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
-                .eq(HrmAttendanceRuleDO::getDeptId, deptId)
-                .eq(HrmAttendanceRuleDO::getStatus, 0));
-        if (!deptRules.isEmpty()) {
-            return deptRules.get(0);
+        // 1. 浠庡憳宸ユ墍鍦ㄩ儴闂ㄥ紑濮嬮�愮骇鍚戜笂鏌ユ壘锛氶厤缃湪涓婄骇閮ㄩ棬鐨勮鍒欏鍏跺瓙閮ㄩ棬鐢熸晥
+        Set<Long> visitedDeptIds = new HashSet<>();
+        Long currentDeptId = deptId;
+        while (currentDeptId != null && currentDeptId != 0 && visitedDeptIds.add(currentDeptId)) {
+            List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectEnabledListByDeptId(currentDeptId);
+            if (!deptRules.isEmpty()) {
+                // 鍚屼竴閮ㄩ棬锛堝銆屾�诲叕鍙搞�嶏級鍙兘閰嶇疆浜嗗鏉″惎鐢ㄨ鍒欙紝浠ユ渶鏂板垱寤虹殑涓哄綋鍓嶇敓鏁堣鍒�
+                return deptRules.get(0);
+            }
+            DeptRespDTO dept = deptApi.getDept(currentDeptId);
+            if (dept == null) {
+                break;
+            }
+            currentDeptId = dept.getParentId();
         }
         // 2. 鏌ユ壘鍏ㄥ眬瑙勫垯锛坉eptId 涓� null锛�
         List<HrmAttendanceRuleDO> globalRules = attendanceRuleMapper.selectList(new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
                 .isNull(HrmAttendanceRuleDO::getDeptId)
-                .eq(HrmAttendanceRuleDO::getStatus, 0));
+                .eq(HrmAttendanceRuleDO::getStatus, 0)
+                .orderByDesc(HrmAttendanceRuleDO::getId));
         if (!globalRules.isEmpty()) {
             return globalRules.get(0);
         }

--
Gitblit v1.9.3