From 3c41f5a06d386ffe40ead600b4053df6237ba3ad Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 00:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 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 3c11c43..9e3c206 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
@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -19,18 +20,18 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
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 cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
-import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
-import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
+import cc.mrbird.febs.server.hr.util.PoiImportExcel;
import cn.hutool.core.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -69,6 +70,14 @@
@PreAuthorize("hasAuthority('empBaseinfo:list')")
public FebsResponse empBaseInfoList(QueryRequest request, EmpBaseInfo empBaseinfo) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findEmpBaseInfos(request, empBaseinfo));
+ return new FebsResponse().data(dataTable);
+ }
+
+ @ApiOperation(value = "智搜人员基本信息翻页列表")
+ @GetMapping("zslist")
+ @PreAuthorize("hasAuthority('empBaseinfo:list')")
+ public FebsResponse empBaseInfoZsList(QueryRequest request, EmpBaseInfo empBaseinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo));
return new FebsResponse().data(dataTable);
}
@@ -142,29 +151,6 @@
throw new FebsException(message);
}
}
-
- @ApiOperation(value = "关闭员工档案")
- @PostMapping("dimission")
- public void dimissionEmp(EmpDimissionLog empDimissionLog) throws FebsException {
- try {
- this.empBaseInfoService.closeEmpArchives(empDimissionLog);
- } catch (Exception e) {
- String message = "关闭员工档案失败";
- log.error(message, e);
- throw new FebsException(message);
- }
- }
- @ApiOperation(value = "员工岗位变更")
- @PostMapping("jobChange")
- public void changeEmpJob(EmpJobChange empJobChange) throws FebsException {
- try {
- this.empBaseInfoService.changeEmpJob(empJobChange);
- } catch (Exception e) {
- String message = "员工调岗保存失败";
- log.error(message, e);
- throw new FebsException(message);
- }
- }
@ApiOperation(value = "导出员工")
@PostMapping("export")
@@ -179,9 +165,23 @@
String dateStr = DateUtil.formatDate(currentDate);
boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
}
-
- @ApiOperation(value = "导出员工")
+
+ @ApiOperation(value = "导入员工")
@PostMapping("importEmp")
- public void importEmp() throws IOException {
+ public void importEmp(MultipartFile file) throws IOException {
+ InputStream in = null;
+ List<List<Object>> listObject = null;
+ try {
+ if (!file.isEmpty()) {
+ in = file.getInputStream();
+ listObject = new PoiImportExcel().getListByExcel(in, file.getOriginalFilename());
+ in.close();
+ empBaseInfoService.importEmpBaseInfo(listObject);
+ }
+ } catch (Exception e) {
+ log.error("导入员工", e);
+ }
+
}
+
}
--
Gitblit v1.8.0