feat(hrm): 考勤规则支持 Excel 导入；修复定位打卡测试类编译错误

tuqin

2 天以前 531b50cab6e42e6146a419bc71c5b494fff774b2

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java

@@ -1,25 +1,43 @@
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.*;

/**
 * 考勤规则配置 Service 实现类
 *
 * @author 芋道源码
 * 说明：同一部门允许配置多条规则，按「生效开始日期 / 生效结束日期」区间区分；
 * 匹配时取覆盖目标日期、且生效开始日期最晚的那条（无日期的视为长期有效，优先级最低）。
 *
 * @author 超级管理员
 */
@Service
@Validated
@@ -28,14 +46,15 @@
    @Resource
    private HrmAttendanceRuleMapper attendanceRuleMapper;

    @Resource
    private DeptApi deptApi;

    @Override
    public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
        // 校验规则名称是否重复
        validateLocation(createReqVO);
        // 校验规则名称是否重复（同一部门允许多条规则，不再限制部门唯一）
        validateAttendanceRuleNameUnique(null, createReqVO.getName());
        // 校验部门是否已配置规则（如果指定了部门）
        if (createReqVO.getDeptId() != null) {
            validateAttendanceRuleDeptUnique(null, createReqVO.getDeptId());
        }
        validateEffectiveDateRange(createReqVO.getEffectiveStartDate(), createReqVO.getEffectiveEndDate());
        HrmAttendanceRuleDO attendanceRule = BeanUtils.toBean(createReqVO, HrmAttendanceRuleDO.class);
        // 设置默认值
        if (attendanceRule.getLateAllowMinutes() == null) {
@@ -56,13 +75,24 @@

    @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());
        // 校验部门是否已配置规则（如果指定了部门）
        if (updateReqVO.getDeptId() != null) {
            validateAttendanceRuleDeptUnique(updateReqVO.getId(), updateReqVO.getDeptId());
        }
        validateEffectiveDateRange(updateReqVO.getEffectiveStartDate(), updateReqVO.getEffectiveEndDate());
        HrmAttendanceRuleDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceRuleDO.class);
        attendanceRuleMapper.updateById(updateObj);
    }
@@ -79,6 +109,39 @@
        }
    }

    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);
        }
    }

    private void validateAttendanceRuleNameUnique(Long id, String name) {
        HrmAttendanceRuleDO rule = attendanceRuleMapper.selectOne(HrmAttendanceRuleDO::getName, name);
        if (rule == null) {
@@ -92,15 +155,12 @@
        }
    }

    private void validateAttendanceRuleDeptUnique(Long id, Long deptId) {
        List<HrmAttendanceRuleDO> rules = attendanceRuleMapper.selectListByDeptId(deptId);
        if (rules.isEmpty()) {
            return;
        }
        for (HrmAttendanceRuleDO rule : rules) {
            if (id == null || !rule.getId().equals(id)) {
                throw exception(ATTENDANCE_RULE_DEPT_EXISTS);
            }
    /**
     * 校验生效日期区间：开始日期不能晚于结束日期
     */
    private void validateEffectiveDateRange(LocalDate startDate, LocalDate endDate) {
        if (startDate != null && endDate != null && startDate.isAfter(endDate)) {
            throw exception(ATTENDANCE_RULE_EFFECTIVE_DATE_INVALID);
        }
    }

@@ -120,22 +180,126 @@
    }

    @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);
    public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId, LocalDate date) {
        LocalDate targetDate = date != null ? date : LocalDate.now();
        // 1. 先查找部门专属规则（覆盖目标日期的，生效开始日期最晚的优先）
        if (deptId != null) {
            List<HrmAttendanceRuleDO> deptRules = selectEffectiveRules(deptId, targetDate);
            if (!deptRules.isEmpty()) {
                return deptRules.get(0);
            }
        }
        // 2. 查找全局规则（deptId 为 null）
        List<HrmAttendanceRuleDO> globalRules = attendanceRuleMapper.selectList(new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
                .isNull(HrmAttendanceRuleDO::getDeptId)
                .eq(HrmAttendanceRuleDO::getStatus, 0));
        List<HrmAttendanceRuleDO> globalRules = selectEffectiveRules(null, targetDate);
        if (!globalRules.isEmpty()) {
            return globalRules.get(0);
        }
        return null;
    }

}
    /**
     * 查询在指定日期生效的规则
     *
     * @param deptId 部门ID，null 表示全局规则
     * @param date   目标日期
     */
    private List<HrmAttendanceRuleDO> selectEffectiveRules(Long deptId, LocalDate date) {
        LambdaQueryWrapperX<HrmAttendanceRuleDO> wrapper = new LambdaQueryWrapperX<>();
        if (deptId == null) {
            wrapper.isNull(HrmAttendanceRuleDO::getDeptId);
        } else {
            wrapper.eq(HrmAttendanceRuleDO::getDeptId, deptId);
        }
        wrapper.eq(HrmAttendanceRuleDO::getStatus, 0);
        // 生效开始日期为空（不限）或 <= 目标日期
        wrapper.and(w -> w.isNull(HrmAttendanceRuleDO::getEffectiveStartDate)
                .or().le(HrmAttendanceRuleDO::getEffectiveStartDate, date));
        // 生效结束日期为空（不限）或 >= 目标日期
        wrapper.and(w -> w.isNull(HrmAttendanceRuleDO::getEffectiveEndDate)
                .or().ge(HrmAttendanceRuleDO::getEffectiveEndDate, date));
        // 生效开始日期越晚优先级越高；同开始日期时取先创建的
        wrapper.orderByDesc(HrmAttendanceRuleDO::getEffectiveStartDate);
        wrapper.orderByAsc(HrmAttendanceRuleDO::getId);
        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);
        }
    }
}