From 182edd4941ef74c3e98813c2a28ac774c262a22d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 10 三月 2021 00:03:27 +0800
Subject: [PATCH] fix(bug修复): 员工智搜和信息录入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 400137b..278e5d5 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
@@ -11,10 +11,12 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cn.hutool.core.annotation.AnnotationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;
@@ -113,7 +115,7 @@
@PreAuthorize("hasAuthority('empBaseinfo:add')")
public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
- throw new FebsException("已存在此员工编号");
+ throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
}
try {
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
@@ -204,13 +206,20 @@
request.setPageNum(1);
List<EmpBaseInfo> exportList = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
List<Map<String, Object>> listMapDicItem = new ArrayList();
- List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
- String fileName = "在职员工列表";
+ 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);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "exportEmpAll",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException {
+ this.empBaseInfoService.exportEmpAll(response,empBaseinfo);
+ }
+
@ApiOperation(value = "导入员工")
@PostMapping("importEmp")
public FebsResponse importEmp(MultipartFile file) {
--
Gitblit v1.8.0