From 531b50cab6e42e6146a419bc71c5b494fff774b2 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 27 十月 2026 09:48:33 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持 Excel 导入；修复定位打卡测试类编译错误
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 144 insertions(+), 1 deletions(-)
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 3421f76..a875825 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
@@ -1,21 +1,34 @@
package cn.iocoder.yudao.module.hrm.service.attendance;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRulePageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceRuleMapper;
+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.validation.annotation.Validated;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
/**
@@ -33,8 +46,12 @@
@Resource
private HrmAttendanceRuleMapper attendanceRuleMapper;
+ @Resource
+ private DeptApi deptApi;
+
@Override
public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
+ validateLocation(createReqVO);
// 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅锛堝悓涓�閮ㄩ棬鍏佽澶氭潯瑙勫垯锛屼笉鍐嶉檺鍒堕儴闂ㄥ敮涓�锛�
validateAttendanceRuleNameUnique(null, createReqVO.getName());
validateEffectiveDateRange(createReqVO.getEffectiveStartDate(), createReqVO.getEffectiveEndDate());
@@ -58,7 +75,21 @@
@Override
public void updateAttendanceRule(HrmAttendanceRuleSaveReqVO updateReqVO) {
- validateAttendanceRuleExists(updateReqVO.getId());
+ HrmAttendanceRuleDO currentRule = attendanceRuleMapper.selectById(updateReqVO.getId());
+ if (currentRule == null) {
+ throw exception(ATTENDANCE_RULE_NOT_EXISTS);
+ }
+ // 鍏煎鏃х鐞嗙锛氭病鏈夋彁浜ゅ湴鐐瑰瓧娈垫椂锛屼笉娓呯┖宸查厤缃殑浣嶇疆闄愬埗銆�
+ if (updateReqVO.getLocationRequired() == null) {
+ updateReqVO.setLocationRequired(currentRule.getLocationRequired());
+ if (updateReqVO.getLocationName() == null) updateReqVO.setLocationName(currentRule.getLocationName());
+ if (updateReqVO.getLocationAddress() == null) updateReqVO.setLocationAddress(currentRule.getLocationAddress());
+ if (updateReqVO.getLongitude() == null) updateReqVO.setLongitude(currentRule.getLongitude());
+ if (updateReqVO.getLatitude() == null) updateReqVO.setLatitude(currentRule.getLatitude());
+ if (updateReqVO.getRadiusMeters() == null) updateReqVO.setRadiusMeters(currentRule.getRadiusMeters());
+ if (updateReqVO.getCoordinateSystem() == null) updateReqVO.setCoordinateSystem(currentRule.getCoordinateSystem());
+ }
+ validateLocation(updateReqVO);
// 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(updateReqVO.getId(), updateReqVO.getName());
validateEffectiveDateRange(updateReqVO.getEffectiveStartDate(), updateReqVO.getEffectiveEndDate());
@@ -75,6 +106,39 @@
private void validateAttendanceRuleExists(Long id) {
if (attendanceRuleMapper.selectById(id) == null) {
throw exception(ATTENDANCE_RULE_NOT_EXISTS);
+ }
+ }
+
+ private void validateLocation(HrmAttendanceRuleSaveReqVO reqVO) {
+ if (reqVO.getLocationRequired() == null) {
+ reqVO.setLocationRequired(false);
+ }
+ if (reqVO.getRadiusMeters() == null) {
+ reqVO.setRadiusMeters(10);
+ }
+ if (StrUtil.isBlank(reqVO.getCoordinateSystem())) {
+ reqVO.setCoordinateSystem("WGS84");
+ } else {
+ reqVO.setCoordinateSystem(reqVO.getCoordinateSystem().trim().toUpperCase(java.util.Locale.ROOT));
+ }
+ if (!"WGS84".equals(reqVO.getCoordinateSystem())) {
+ throw exception(ATTENDANCE_LOCATION_SYSTEM_INVALID);
+ }
+ if (reqVO.getLongitude() != null && (reqVO.getLongitude().compareTo(BigDecimal.valueOf(-180)) < 0
+ || reqVO.getLongitude().compareTo(BigDecimal.valueOf(180)) > 0)) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ if (reqVO.getLatitude() != null && (reqVO.getLatitude().compareTo(BigDecimal.valueOf(-90)) < 0
+ || reqVO.getLatitude().compareTo(BigDecimal.valueOf(90)) > 0)) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ if (reqVO.getRadiusMeters() < 10 || reqVO.getRadiusMeters() > 5000) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
+ }
+ if (Boolean.TRUE.equals(reqVO.getLocationRequired())
+ && (StrUtil.isBlank(reqVO.getLocationName()) || reqVO.getLongitude() == null
+ || reqVO.getLatitude() == null)) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
}
}
@@ -159,4 +223,83 @@
return attendanceRuleMapper.selectList(wrapper);
}
+ /**
+ * 瀵煎叆鑰冨嫟瑙勫垯锛堢Щ妞嶈嚜鏂伴珮鐢靛姏锛�
+ *
+ * 璇存槑锛氬鍏ユ寜銆岃鍒欏悕绉般�嶅垽閲嶏紱宸插瓨鍦ㄦ椂闇� updateSupport=true 鎵嶈鐩栥��
+ * 閮ㄩ棬鎸夊悕绉板尮閰嶏紙deptName -> deptId锛夛紝閮ㄩ棬涓虹┖琛ㄧず鍏ㄥ眬瑙勫垯銆�
+ */
+ @Override
+ public HrmAttendanceRuleImportRespVO importAttendanceRuleList(
+ List<HrmAttendanceRuleImportExcelVO> importList, HrmAttendanceRuleImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importList = filterList(importList, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(ATTENDANCE_RULE_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 棰勫姞杞介儴闂ㄥ悕绉� -> 閮ㄩ棬ID
+ Map<String, Long> deptMap = deptApi.getDeptList().stream()
+ .filter(dept -> StrUtil.isNotBlank(dept.getName()))
+ .collect(Collectors.toMap(DeptRespDTO::getName, DeptRespDTO::getId, (a, b) -> a));
+ // 3. 閫愭潯澶勭悊
+ HrmAttendanceRuleImportRespVO respVO = HrmAttendanceRuleImportRespVO.builder()
+ .createNames(new ArrayList<>())
+ .updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>())
+ .build();
+ importList.forEach(importRule -> {
+ try {
+ // 3.1 瑙ｆ瀽閮ㄩ棬
+ Long deptId = null;
+ if (StrUtil.isNotBlank(importRule.getDeptName())) {
+ deptId = deptMap.get(importRule.getDeptName());
+ if (deptId == null) {
+ throw exception(ATTENDANCE_RULE_DEPT_NOT_EXISTS, importRule.getDeptName());
+ }
+ }
+ // 3.2 鍒ゆ柇鏄惁瀛樺湪锛堟寜鍚嶇О鍞竴锛�
+ HrmAttendanceRuleDO existRule = attendanceRuleMapper.selectOne(HrmAttendanceRuleDO::getName, importRule.getName());
+ if (existRule == null) {
+ // 3.2.1 鏂板
+ HrmAttendanceRuleDO rule = BeanUtils.toBean(importRule, HrmAttendanceRuleDO.class).setDeptId(deptId);
+ applyImportDefaults(rule);
+ attendanceRuleMapper.insert(rule);
+ respVO.getCreateNames().add(importRule.getName());
+ return;
+ }
+ // 3.2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!Boolean.TRUE.equals(importReqVO.getUpdateSupport())) {
+ respVO.getFailureNames().put(importRule.getName(),
+ StrUtil.format(ATTENDANCE_RULE_EXISTS.getMsg(), importRule.getName()));
+ return;
+ }
+ HrmAttendanceRuleDO updateRule = BeanUtils.toBean(importRule, HrmAttendanceRuleDO.class)
+ .setId(existRule.getId()).setDeptId(deptId);
+ applyImportDefaults(updateRule);
+ attendanceRuleMapper.updateById(updateRule);
+ respVO.getUpdateNames().add(importRule.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureNames().put(importRule.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ /**
+ * 瀵煎叆鏃剁殑榛樿鍊艰ˉ鍏紙涓庨〉闈㈡柊澧炰繚鎸佷竴鑷寸殑榛樿鍙ｅ緞锛涗笉瑕嗙洊鍦扮偣瀛楁锛岄伩鍏嶅鍏ユ竻绌哄凡閰嶇疆鐨勫湴鐐癸級
+ */
+ private void applyImportDefaults(HrmAttendanceRuleDO rule) {
+ if (rule.getLateAllowMinutes() == null) {
+ rule.setLateAllowMinutes(0);
+ }
+ if (rule.getEarlyAllowMinutes() == null) {
+ rule.setEarlyAllowMinutes(0);
+ }
+ if (rule.getOvertimeThreshold() == null) {
+ rule.setOvertimeThreshold(BigDecimal.ONE);
+ }
+ if (rule.getStatus() == null) {
+ rule.setStatus(0);
+ }
+ }
}
--
Gitblit v1.9.3