From 4e55bd9cee8e44f7a7a0d9185d8323fc7be9193d Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 21:14:01 +0800
Subject: [PATCH] fix(hr): 修正员工基础信息字典字段的大小写问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index a9a02e8..821ecba 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -27,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
@@ -283,6 +284,12 @@
@PostMapping("addInEmp")
@PreAuthorize("hasAuthority('empBaseinfo:add')")
public FebsResponse addInEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
+ if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
+ throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
+ }
+ if(this.empBaseInfoService.verifyCertificateNumb(empBaseinfo)){
+ throw new FebsException("已存在此身份证号:" + empBaseinfo.getCertificateNumb());
+ }
try {
return new FebsResponse().data(empBaseInfoService.addInEmpBaseInfo(empBaseinfo));
} catch (Exception e) {
@@ -341,7 +348,9 @@
@ApiOperation(value = "导出社保四险员工")
@PostMapping(value = "export/insurance")
@ControllerEndpoint(operation = "导出社保四险数据", exceptionMessage = "导出 Excel 失败")
- public void exportInsuranceWithField(QueryRequest request, HttpServletResponse response, String exportField, EmpBaseInfo empBaseinfo) throws IOException {
+ public void exportInsuranceWithField(QueryRequest request, HttpServletRequest httpRequest, HttpServletResponse response, EmpBaseInfo empBaseinfo) throws IOException {
+ String exportField = httpRequest.getParameter("exportField");
+ log.info("exportField: {}", exportField);
request.setPageSize(25535);
request.setPageNum(1);
List<EmpBaseInfo> exportList = this.empBaseInfoService.findInsuranceEmpBaseInfos(request, empBaseinfo).getRecords();
@@ -400,6 +409,8 @@
* @throws IOException IO 异常
*/
private void exportExcel(HttpServletResponse response, String exportField, List<EmpBaseInfo> exportList, String fileName) throws IOException {
+ log.info("导出Excel - exportField: {}", exportField);
+ log.info("导出Excel - exportList size: {}", exportList != null ? exportList.size() : 0);
List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, null);
Date currentDate = new Date();
String dateStr = DateUtil.formatDate(currentDate);
--
Gitblit v1.8.0