From f4151abee349597ed58a405a8a5e48a5d1a1f7a6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 02 六月 2024 19:06:39 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
index 5cd2e54..1f54af0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
@@ -1,11 +1,16 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cn.hutool.core.util.StrUtil;
+import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +19,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +56,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empOccupationalService.findEmpOccupationals(request, empOccupational));
return new FebsResponse().data(dataTable);
}
-
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpOccupational empBaseinfo, HttpServletResponse response) {
+ request.setPageSize(this.empOccupationalService.count());
+ List<EmpOccupational> records = this.empOccupationalService.findEmpOccupationals(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpOccupational.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empOccupational:add')")
public void addEmpOccupational(@Valid EmpOccupational empOccupational) throws FebsException {
@@ -57,6 +71,9 @@
this.empOccupationalService.createEmpOccupational(empOccupational);
} catch (Exception e) {
String message = "新增员工工伤案件失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
log.error(message, e);
throw new FebsException(message);
}
@@ -75,7 +92,6 @@
}
@DeleteMapping("{ids}")
- @PreAuthorize("hasAuthority('empOccupational:delete')")
public void logicDeleteEmpOccupational(@PathVariable("ids") String ids) throws FebsException {
try {
this.empOccupationalService.logicDelEmpOccupational(ids);
--
Gitblit v1.8.0