From bfd4ded5aaf7fcead591435d504bea9105d2fd2e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 12 五月 2021 12:40:31 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 4626a43..94c1c9c 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
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,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;
/**
@@ -50,7 +55,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
return new FebsResponse().data(dataTable);
}
-
+ @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);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empContractinfo:add')")
public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
@@ -76,7 +88,6 @@
}
@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empContractinfo:delete')")
public void logicDeleteEmpContractinfo(@PathVariable("ids") String ids) throws FebsException {
try {
this.empContractinfoService.logicDelEmpContractinfo(ids);
--
Gitblit v1.8.0