From 578f84ece732a710278e7914396e127d8a27ed8a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 10:05:18 +0800
Subject: [PATCH] feat(hrm): 排班管理联动已审批请假
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmEmployeeScheduleLeaveRespVO.java | 42 ++++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleServiceImpl.java | 87 ++++++++++++++++++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java | 15 +++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java | 21 +++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleService.java | 11 +++
5 files changed, 175 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java
index 053ab2b..e503d1d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java
@@ -3,18 +3,22 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchSaveRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleLeaveRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleListReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleSaveReqVO;
import cn.iocoder.yudao.module.hrm.service.attendance.HrmEmployeeScheduleService;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
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.time.LocalDate;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -53,4 +57,15 @@
return success(employeeScheduleService.batchSaveSchedule(reqVO));
}
+ @GetMapping("/leave-list")
+ @Operation(summary = "鑾峰緱鏃ユ湡鑼冨洿鍐呭鎵归�氳繃鐨勮鍋囪褰曪紙鎺掔彮鏃ュ巻灞曠ず鐢級")
+ @Parameter(name = "startDate", description = "寮�濮嬫棩鏈�", required = true, example = "2026-11-01")
+ @Parameter(name = "endDate", description = "缁撴潫鏃ユ湡锛堝惈锛�", required = true, example = "2026-11-30")
+ @PreAuthorize("@ss.hasPermission('hrm:employee-schedule:query')")
+ public CommonResult<List<HrmEmployeeScheduleLeaveRespVO>> getApprovedLeaveList(
+ @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
+ @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) {
+ return success(employeeScheduleService.getApprovedLeaveList(startDate, endDate));
+ }
+
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmEmployeeScheduleLeaveRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmEmployeeScheduleLeaveRespVO.java
new file mode 100644
index 0000000..c3b04e6
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmEmployeeScheduleLeaveRespVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 绠$悊鍚庡彴 - 鎺掔彮鏃ュ巻灞曠ず鐢ㄧ殑璇峰亣璁板綍 Response VO
+ *
+ * 鍙繑鍥炲鎵归�氳繃鐨勮鍋囷紝鐢ㄤ簬鍦ㄦ帓鐝綉鏍间腑鏍囧嚭鍛樺伐璇峰亣鏃ユ湡銆�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鎺掔彮璇峰亣璁板綍 Response VO")
+@Data
+public class HrmEmployeeScheduleLeaveRespVO {
+
+ @Schema(description = "璇峰亣鐢宠ID", example = "1")
+ private Long id;
+
+ @Schema(description = "鍛樺伐ID", example = "1")
+ private Long employeeId;
+
+ @Schema(description = "鍛樺伐濮撳悕", example = "寮犱笁")
+ private String employeeName;
+
+ @Schema(description = "璇峰亣绫诲瀷锛�1-浜嬪亣锛�2-鐥呭亣锛�3-骞村亣锛�4-濠氬亣锛�5-浜у亣锛�6-涓у亣", example = "3")
+ private Integer leaveType;
+
+ @Schema(description = "璇峰亣绫诲瀷鍚嶇О", example = "骞村亣")
+ private String leaveTypeName;
+
+ @Schema(description = "寮�濮嬫椂闂�")
+ private LocalDateTime startTime;
+
+ @Schema(description = "缁撴潫鏃堕棿")
+ private LocalDateTime endTime;
+
+ @Schema(description = "璇峰亣鏃堕暱锛堝ぉ锛�", example = "2")
+ private BigDecimal duration;
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
index 6d98f1a..0b90cce 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
@@ -54,4 +54,25 @@
.le(HrmLeaveApplicationDO::getEndTime, endTime));
}
+ /**
+ * 鏌ヨ涓庢寚瀹氭椂闂磋寖鍥存湁浜ら泦鐨勫鎵归�氳繃璇峰亣璁板綍锛堝彲闄愬畾鐢宠浜猴級
+ *
+ * 璇峰亣寮�濮嬫棭浜庤寖鍥磋捣鐐广�佺粨鏉熸櫄浜庤寖鍥寸粓鐐逛篃绠椾氦闆嗭紝鍥犳鐢� start <= 鑼冨洿缁堢偣 涓� end >= 鑼冨洿璧风偣銆�
+ *
+ * @param startTime 鑼冨洿寮�濮嬫椂闂�
+ * @param endTime 鑼冨洿缁撴潫鏃堕棿
+ * @param userIds 鐢宠浜篒D闆嗗悎锛屼负绌鸿〃绀轰笉闄�
+ * @return 璇峰亣璁板綍鍒楄〃
+ */
+ default List<HrmLeaveApplicationDO> selectApprovedListByTimeRange(LocalDateTime startTime, LocalDateTime endTime,
+ java.util.Collection<Long> userIds) {
+ LambdaQueryWrapperX<HrmLeaveApplicationDO> query = new LambdaQueryWrapperX<HrmLeaveApplicationDO>()
+ .inIfPresent(HrmLeaveApplicationDO::getUserId, userIds);
+ query.eq(HrmLeaveApplicationDO::getStatus, HrmAuditStatusEnum.APPROVE.getStatus())
+ .le(HrmLeaveApplicationDO::getStartTime, endTime)
+ .ge(HrmLeaveApplicationDO::getEndTime, startTime)
+ .orderByAsc(HrmLeaveApplicationDO::getStartTime);
+ return selectList(query);
+ }
+
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleService.java
index fedabb0..6ece324 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleService.java
@@ -2,10 +2,12 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchSaveRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleLeaveRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleListReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleSaveReqVO;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -30,4 +32,13 @@
*/
HrmEmployeeScheduleBatchSaveRespVO batchSaveSchedule(HrmEmployeeScheduleBatchSaveReqVO reqVO);
+ /**
+ * 鏌ヨ鏃ユ湡鑼冨洿鍐呭鎵归�氳繃鐨勮鍋囪褰曪紙鎺掔彮鏃ュ巻灞曠ず鐢級
+ *
+ * @param startDate 寮�濮嬫棩鏈�
+ * @param endDate 缁撴潫鏃ユ湡
+ * @return 璇峰亣璁板綍鍒楄〃锛堝惈鍛樺伐ID锛�
+ */
+ List<HrmEmployeeScheduleLeaveRespVO> getApprovedLeaveList(LocalDate startDate, LocalDate endDate);
+
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleServiceImpl.java
index 2c597c6..15f64c2 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmEmployeeScheduleServiceImpl.java
@@ -6,14 +6,19 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchSaveRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleLeaveRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleListReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleSaveReqVO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmLeaveApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceHolidayDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmEmployeeScheduleDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmShiftDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmLeaveApplicationMapper;
import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceHolidayTypeEnum;
+import cn.iocoder.yudao.module.hrm.enums.HrmLeaveTypeEnum;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmEmployeeScheduleMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmShiftMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
@@ -26,6 +31,7 @@
import java.time.DayOfWeek;
import java.time.LocalDate;
+import java.time.LocalTime;
import java.time.YearMonth;
import java.util.*;
import java.util.function.Function;
@@ -53,6 +59,8 @@
private DeptApi deptApi;
@Resource
private HrmAttendanceHolidayService attendanceHolidayService;
+ @Resource
+ private HrmLeaveApplicationMapper leaveApplicationMapper;
@Override
public List<HrmEmployeeScheduleRespVO> getScheduleList(HrmEmployeeScheduleListReqVO reqVO) {
@@ -191,12 +199,20 @@
.collect(Collectors.toMap(HrmAttendanceHolidayDO::getDate, HrmAttendanceHolidayDO::getType,
(a, b) -> a));
- // 5. 鎸夋棩鏈熼�愬ぉ鐢熸垚鎺掔彮锛氫紤鎭棩鍒犻櫎鍘熺彮娆★紝宸ヤ綔鏃� upsert
+ // 5. 棰勫姞杞界洰鏍囧憳宸ョ殑宸插鎵硅鍋囷細璇峰亣褰撳ぉ璺宠繃锛屼笉鎺掔彮涔熶笉娓呴櫎宸叉湁鎺掔彮
+ Map<Long, Set<LocalDate>> leaveDateMap = buildLeaveDateMap(employees,
+ reqVO.getStartDate(), reqVO.getEndDate());
+
+ // 6. 鎸夋棩鏈熼�愬ぉ鐢熸垚鎺掔彮锛氫紤鎭棩鍒犻櫎鍘熺彮娆★紝宸ヤ綔鏃� upsert
int itemCount = 0;
for (LocalDate date = reqVO.getStartDate(); !date.isAfter(reqVO.getEndDate()); date = date.plusDays(1)) {
boolean rest = isRestDay(date, reqVO.getRestMode(), holidayTypeMap.get(date))
|| reqVO.getShiftId() == null;
for (HrmEmployeeDO employee : employees) {
+ // 鍛樺伐褰撳ぉ鍦ㄨ鍋囨湡鍐咃紝淇濇寔鍘熸帓鐝笉鍔�
+ if (leaveDateMap.getOrDefault(employee.getId(), Collections.emptySet()).contains(date)) {
+ continue;
+ }
HrmEmployeeScheduleDO existing = existingMap.get(scheduleKey(employee.getId(), date));
if (rest) {
if (existing != null) {
@@ -226,6 +242,75 @@
return respVO;
}
+ @Override
+ public List<HrmEmployeeScheduleLeaveRespVO> getApprovedLeaveList(LocalDate startDate, LocalDate endDate) {
+ if (startDate == null || endDate == null || endDate.isBefore(startDate)) {
+ return Collections.emptyList();
+ }
+ List<HrmLeaveApplicationDO> leaves = leaveApplicationMapper.selectApprovedListByTimeRange(
+ startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX), null);
+ if (CollUtil.isEmpty(leaves)) {
+ return Collections.emptyList();
+ }
+ Set<Long> userIds = leaves.stream().map(HrmLeaveApplicationDO::getUserId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, HrmEmployeeDO> userEmployeeMap = CollUtil.isEmpty(userIds) ? Collections.emptyMap()
+ : employeeMapper.selectList(new LambdaQueryWrapperX<HrmEmployeeDO>()
+ .in(HrmEmployeeDO::getUserId, userIds)).stream()
+ .filter(employee -> employee.getUserId() != null)
+ .collect(Collectors.toMap(HrmEmployeeDO::getUserId, Function.identity(), (a, b) -> a));
+ return leaves.stream().map(leave -> {
+ HrmEmployeeDO employee = userEmployeeMap.get(leave.getUserId());
+ if (employee == null) {
+ return null;
+ }
+ HrmEmployeeScheduleLeaveRespVO respVO = new HrmEmployeeScheduleLeaveRespVO();
+ respVO.setId(leave.getId());
+ respVO.setEmployeeId(employee.getId());
+ respVO.setEmployeeName(employee.getName());
+ respVO.setLeaveType(leave.getLeaveType());
+ respVO.setLeaveTypeName(HrmLeaveTypeEnum.getNameByStatus(leave.getLeaveType()));
+ respVO.setStartTime(leave.getStartTime());
+ respVO.setEndTime(leave.getEndTime());
+ respVO.setDuration(leave.getDuration());
+ return respVO;
+ }).filter(Objects::nonNull).collect(Collectors.toList());
+ }
+
+ /**
+ * 鏋勫缓銆屽憳宸D -> 璇峰亣鏃ラ泦鍚堛�嶆槧灏勶紙鍙彇瀹℃壒閫氳繃鐨勮鍋囷紝涓旇鍓埌鎺掔彮鏃ユ湡鑼冨洿鍐咃級
+ */
+ private Map<Long, Set<LocalDate>> buildLeaveDateMap(List<HrmEmployeeDO> employees,
+ LocalDate startDate, LocalDate endDate) {
+ Map<Long, HrmEmployeeDO> userEmployeeMap = employees.stream()
+ .filter(employee -> employee.getUserId() != null)
+ .collect(Collectors.toMap(HrmEmployeeDO::getUserId, Function.identity(), (a, b) -> a));
+ if (userEmployeeMap.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ List<HrmLeaveApplicationDO> leaves = leaveApplicationMapper.selectApprovedListByTimeRange(
+ startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX), userEmployeeMap.keySet());
+ if (CollUtil.isEmpty(leaves)) {
+ return Collections.emptyMap();
+ }
+ Map<Long, Set<LocalDate>> result = new HashMap<>();
+ for (HrmLeaveApplicationDO leave : leaves) {
+ HrmEmployeeDO employee = userEmployeeMap.get(leave.getUserId());
+ if (employee == null || leave.getStartTime() == null || leave.getEndTime() == null) {
+ continue;
+ }
+ LocalDate from = leave.getStartTime().toLocalDate().isBefore(startDate)
+ ? startDate : leave.getStartTime().toLocalDate();
+ LocalDate to = leave.getEndTime().toLocalDate().isAfter(endDate)
+ ? endDate : leave.getEndTime().toLocalDate();
+ Set<LocalDate> dates = result.computeIfAbsent(employee.getId(), key -> new HashSet<>());
+ for (LocalDate date = from; !date.isAfter(to); date = date.plusDays(1)) {
+ dates.add(date);
+ }
+ }
+ return result;
+ }
+
private Set<Long> getSelfAndChildDeptIds(Long deptId) {
Set<Long> deptIds = new LinkedHashSet<>();
deptIds.add(deptId);
--
Gitblit v1.9.3