feat(hrm): 新增排班功能，薪酬核算按排班工时

liu

12 小时以前 9697bac35fe2c74811afaf66f9cf28b758f3a386

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.hrm.dal.mysql.employee;

import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -7,6 +8,7 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import org.apache.ibatis.annotations.Mapper;

import java.util.Collection;
import java.util.List;

/**
@@ -19,6 +21,14 @@

    default HrmEmployeeDO selectByPhone(String phone) {
        return selectOne(HrmEmployeeDO::getPhone, phone);
    }

    default HrmEmployeeDO selectByName(String name) {
        return selectOne(HrmEmployeeDO::getName, name);
    }

    default List<HrmEmployeeDO> selectListByName(String name) {
        return selectList(HrmEmployeeDO::getName, name);
    }

    default HrmEmployeeDO selectByEmployeeNo(String employeeNo) {
@@ -38,12 +48,41 @@
    }

    default PageResult<HrmEmployeeDO> selectPage(HrmEmployeePageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeDO>()
        LambdaQueryWrapperX<HrmEmployeeDO> wrapper = new LambdaQueryWrapperX<HrmEmployeeDO>()
                .likeIfPresent(HrmEmployeeDO::getEmployeeNo, reqVO.getEmployeeNo())
                .likeIfPresent(HrmEmployeeDO::getName, reqVO.getName())
                .eqIfPresent(HrmEmployeeDO::getDeptId, reqVO.getDeptId())
                .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus())
                .orderByDesc(HrmEmployeeDO::getId));
                .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus());
        appendKeyword(wrapper, reqVO.getKeyword());
        wrapper.orderByDesc(HrmEmployeeDO::getId);
        return selectPage(reqVO, wrapper);
    }

    /**
     * 按部门集合（含子部门）分页查询员工
     */
    default PageResult<HrmEmployeeDO> selectPageByDeptIds(HrmEmployeePageReqVO reqVO, Collection<Long> deptIds) {
        LambdaQueryWrapperX<HrmEmployeeDO> wrapper = new LambdaQueryWrapperX<HrmEmployeeDO>()
                .likeIfPresent(HrmEmployeeDO::getEmployeeNo, reqVO.getEmployeeNo())
                .likeIfPresent(HrmEmployeeDO::getName, reqVO.getName())
                .inIfPresent(HrmEmployeeDO::getDeptId, deptIds)
                .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus());
        appendKeyword(wrapper, reqVO.getKeyword());
        wrapper.orderByDesc(HrmEmployeeDO::getId);
        return selectPage(reqVO, wrapper);
    }

    /**
     * 关键词模糊匹配员工编号 / 姓名 / 手机号
     */
    private void appendKeyword(LambdaQueryWrapperX<HrmEmployeeDO> wrapper, String keyword) {
        if (StrUtil.isBlank(keyword)) {
            return;
        }
        String kw = keyword.trim();
        wrapper.and(w -> w.like(HrmEmployeeDO::getEmployeeNo, kw)
                .or().like(HrmEmployeeDO::getName, kw)
                .or().like(HrmEmployeeDO::getPhone, kw));
    }

    default List<HrmEmployeeDO> selectListByStatus(Integer employeeStatus) {