From d3dad0dc820d7baf365cc10288fdb5094a7babfa Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期四, 19 三月 2026 10:32:41 +0800
Subject: [PATCH] fix(hr): 修复员工信息导入时身份证有效期设置问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 03f4a7a..2407892 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -7,7 +7,8 @@
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
-import com.wuwenze.poi.ExcelKit;
+import cc.mrbird.febs.server.hr.util.PoiExportExcel;
+import cn.hutool.core.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -19,6 +20,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.io.IOException;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -64,10 +67,18 @@
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
- public void export(QueryRequest request, EmpContractInfo empBaseinfo, HttpServletResponse response) {
- request.setPageSize(this.empContractinfoService.count());
- List<EmpContractInfo> records = this.empContractinfoService.findEmpContractinfos(request, empBaseinfo).getRecords();
- ExcelKit.$Export(EmpContractInfo.class, response).downXlsx(records, false);
+ public void export(QueryRequest request, HttpServletResponse response,String exportField, EmpContractInfo empBaseInfo) throws IOException {
+ // request.setPageSize(this.empContractinfoService.count());
+ // List<EmpContractInfo> records = this.empContractinfoService.findEmpContractinfos(request, empBaseinfo).getRecords();
+ // ExcelKit.$Export(EmpContractInfo.class, response).downXlsx(records, false);
+ request.setPageSize(25535);
+ request.setPageNum(1);
+ List<EmpContractInfo> exportList = this.empContractinfoService.findRemindContractinfos(request, empBaseInfo).getRecords();
+ List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, null);
+ String fileName = "合同到期提醒员工列表";
+ Date currentDate = new Date();
+ String dateStr = DateUtil.formatDate(currentDate);
+ boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
}
@PostMapping
--
Gitblit v1.8.0