From f2c5864b2973e15959590eea78742a82085cd10d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 五月 2026 17:25:42 +0800
Subject: [PATCH] 人员考勤：应勤时长计算错误问题修复&奖惩记录导出调整
---
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
index b0633b3..81a35cc 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.personnel.dto.PersonRewardPunishmentRecordDto;
import com.ruoyi.personnel.excel.PersonRewardPunishmentRecordExcel;
import com.ruoyi.personnel.pojo.PersonRewardPunishmentRecord;
+import com.ruoyi.personnel.vo.PersonRewardPunishmentRecordVO;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
@@ -21,7 +22,7 @@
*/
public interface PersonRewardPunishmentRecordMapper extends BaseMapper<PersonRewardPunishmentRecord> {
- IPage<PersonRewardPunishmentRecordDto> rewardPunishmentPage(Page page, @Param("userId") Integer userId, @Param("userName") String userName,@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("departmentId") Integer departmentId);
+ IPage<PersonRewardPunishmentRecordVO> rewardPunishmentPage(Page page, @Param("dto") PersonRewardPunishmentRecordDto punishmentRecordDto);
- List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(@Param("userId") Integer userId, @Param("departmentId") Integer departmentId, @Param("userName") String userName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+ List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(@Param("dto") PersonRewardPunishmentRecordDto punishmentRecordDto);
}
--
Gitblit v1.9.3