From b5d5b7676c92eee961ca34259848bfcb97115c7b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 四月 2026 15:56:00 +0800
Subject: [PATCH] 奖惩记录迁移到绩效模块
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java
index ed82a41..e1f09be 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonRewardPunishmentRecordServiceImpl.java
@@ -1,5 +1,8 @@
package com.ruoyi.personnel.service.impl;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,8 +11,13 @@
import com.ruoyi.personnel.mapper.PersonRewardPunishmentRecordMapper;
import com.ruoyi.personnel.pojo.PersonRewardPunishmentRecord;
import com.ruoyi.personnel.service.PersonRewardPunishmentRecordService;
+import com.ruoyi.personnel.vo.PersonRewardPunishmentRecordVO;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -25,12 +33,34 @@
public class PersonRewardPunishmentRecordServiceImpl extends ServiceImpl<PersonRewardPunishmentRecordMapper, PersonRewardPunishmentRecord> implements PersonRewardPunishmentRecordService {
@Override
- public IPage<PersonRewardPunishmentRecordDto> rewardPunishmentPage(Page page, Integer userId, String userName, Date startTime, Date endTime, Integer departmentId) {
- return baseMapper.rewardPunishmentPage(page, userId, userName, startTime, endTime, departmentId);
+ public IPage<PersonRewardPunishmentRecordVO> rewardPunishmentPage(Page page, PersonRewardPunishmentRecordDto punishmentRecordDto) {
+ return baseMapper.rewardPunishmentPage(page, punishmentRecordDto);
}
@Override
- public List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(Integer userId, Integer departmentId, String userName, Date startTime, Date endTime) {
- return baseMapper.rewardPunishmentExport(userId, departmentId, userName, startTime, endTime);
+ public List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(PersonRewardPunishmentRecordDto punishmentRecordDto) {
+ return baseMapper.rewardPunishmentExport(punishmentRecordDto);
+ }
+
+ @Override
+ public void exportExcel(PersonRewardPunishmentRecordDto punishmentRecordDto, HttpServletResponse response) {
+ response.reset();
+ try{
+ List<PersonRewardPunishmentRecordExcel> data = rewardPunishmentExport(punishmentRecordDto);
+ //瀵煎嚭
+ String fileName = "涓ぉ鑰愪笣璐ㄩ噺閮ㄥ鎯╄褰�"+ ExcelTypeEnum.XLSX;
+ fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
+ response.setContentType("application/vnd.ms-excel");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+ EasyExcel.write(response.getOutputStream())
+ .head(PersonRewardPunishmentRecordExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 鑷�傚簲鍒楀
+ .sheet()
+ .doWrite(data);
+ }catch (Exception e){
+ throw new RuntimeException("濂栨儵璁板綍瀵煎嚭澶辫触");
+ }
}
}
--
Gitblit v1.9.3