From 655ba7e8220644462441b401c6d763530e1363a9 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 18 二月 2021 22:59:39 +0800
Subject: [PATCH] 增加导出员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 24 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 57681d5..3c11c43 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,26 +1,41 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.common.core.entity.system.Dept;
-import cc.mrbird.febs.common.core.entity.system.SystemUser;
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
-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 java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
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 cn.hutool.core.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
/**
* name:EmpBaseInfo
@@ -61,7 +76,11 @@
@PostMapping
@PreAuthorize("hasAuthority('empBaseinfo:add')")
public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
+ if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
+ throw new FebsException("已存在此员工编号");
+ }
try {
+ //EmpBaseInfo tempInfo = this.empBaseInfoService.
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
String message = "新增员工基本信息失败";
@@ -86,7 +105,7 @@
@ApiOperation(value = "人员基本信息逻辑删除")
@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empBaseinfo:delete')")
- public void logicDeleteEmpBaseInfo(@PathVariable("ids") String ids) throws FebsException {
+ public void logicDeleteEmpBaseInfo(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empBaseInfoService.logicDelEmpBaseInfo(ids);
} catch (Exception e) {
@@ -99,7 +118,10 @@
@ApiOperation(value = "人员基本信息修改")
@PutMapping
@PreAuthorize("hasAuthority('empBaseinfo:update')")
- public void updateEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
+ public void updateEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
+ if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
+ throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
+ }
try {
this.empBaseInfoService.updateEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
@@ -108,13 +130,58 @@
throw new FebsException(message);
}
}
+ @ApiOperation(value = "基本信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empBaseinfo:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empBaseInfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "基本信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
- // @GetMapping("user/list")
- // public FebsResponse getRemoteUserList(QueryRequest request, SystemUser user) {
- // return remoteUserService.userList(request, user);
- // }
- // @GetMapping("dept/list")
- // public List<Dept> getRemoteDeptList(Dept dept) {
- // return remoteDeptService.selectAllDept(dept);
- // }
+ @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")
+ public void export(QueryRequest request, HttpServletResponse response, String exportField) throws IOException {
+ EmpBaseInfo empBaseinfo = new EmpBaseInfo();
+ empBaseinfo.setDelFlag(0);
+ List<EmpBaseInfo> exportList = empBaseInfoService.findEmpBaseInfos(empBaseinfo);
+ List<Map<String, Object>> listMapDicItem = new ArrayList();
+ List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
+ String fileName = "在职员工列表";
+ Date currentDate = new Date();
+ String dateStr = DateUtil.formatDate(currentDate);
+ boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
+ }
+
+ @ApiOperation(value = "导出员工")
+ @PostMapping("importEmp")
+ public void importEmp() throws IOException {
+ }
}
--
Gitblit v1.8.0