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/service/PersonRewardPunishmentRecordService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java
index ecb6fa1..3a93fe2 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonRewardPunishmentRecordService.java
@@ -6,7 +6,9 @@
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 javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
@@ -20,12 +22,9 @@
*/
public interface PersonRewardPunishmentRecordService extends IService<PersonRewardPunishmentRecord> {
- IPage<PersonRewardPunishmentRecordDto> rewardPunishmentPage(Page page,
- Integer userId,
- String userName,
- Date startTime,
- Date endTime,
- Integer departmentId);
+ IPage<PersonRewardPunishmentRecordVO> rewardPunishmentPage(Page page,PersonRewardPunishmentRecordDto punishmentRecordDto);
- List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(Integer userId, Integer departmentId, String userName, Date startTime, Date endTime);
+ List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(PersonRewardPunishmentRecordDto punishmentRecordDto);
+
+ void exportExcel(PersonRewardPunishmentRecordDto punishmentRecordDto, HttpServletResponse response);
}
--
Gitblit v1.9.3