From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java
index cd43c13..48a0aae 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java
@@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.hrm.dal.mysql.salary;
+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;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmEmployeeSalaryPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmEmployeeSalaryDO;
import org.apache.ibatis.annotations.Mapper;
@@ -11,7 +13,7 @@
/**
* 鍛樺伐钖叕妗ｆ Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface HrmEmployeeSalaryMapper extends BaseMapperX<HrmEmployeeSalaryDO> {
@@ -36,4 +38,12 @@
.orderByDesc(HrmEmployeeSalaryDO::getEffectiveDate));
}
+ default PageResult<HrmEmployeeSalaryDO> selectPage(HrmEmployeeSalaryPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeSalaryDO>()
+ .eqIfPresent(HrmEmployeeSalaryDO::getUserId, reqVO.getUserId())
+ .eqIfPresent(HrmEmployeeSalaryDO::getSalaryStructureId, reqVO.getSalaryStructureId())
+ .eqIfPresent(HrmEmployeeSalaryDO::getStatus, reqVO.getStatus())
+ .orderByDesc(HrmEmployeeSalaryDO::getId));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3