From 6cfb6f557c4b74e6031aea7899d1b3fa58255da0 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期日, 21 二月 2021 13:55:25 +0800
Subject: [PATCH] 提交首页查询Bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 141 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 117 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 87d7f13..c14b771 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,24 +1,42 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.common.core.entity.system.Dept;
+import java.io.IOException;
+import java.io.InputStream;
+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 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 cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import com.wuwenze.poi.ExcelKit;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+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 lombok.extern.slf4j.Slf4j;
+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 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;
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
@@ -29,6 +47,7 @@
* @date 2021-01-30 08:04:50
* @since JDK1.8
*/
+@Api(tags = "人员基本信息录入接口")
@Slf4j
@Validated
@RestController
@@ -39,23 +58,38 @@
private final IEmpBaseInfoService empBaseInfoService;
private final IRemoteUserService remoteUserService;
private final IRemoteDeptService remoteDeptService;
+
+ @ApiOperation(value = "人员基本信息无翻页列表")
@GetMapping
@PreAuthorize("hasAuthority('empBaseinfo:list')")
public FebsResponse getAllEmpBaseInfos(EmpBaseInfo empBaseinfo) {
return new FebsResponse().data(empBaseInfoService.findEmpBaseInfos(empBaseinfo));
}
-
+ @ApiOperation(value = "人员基本信息翻页列表")
@GetMapping("list")
@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);
+ }
+ @ApiOperation(value = "人员基本信息增加")
@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 = "新增员工基本信息失败";
@@ -64,6 +98,7 @@
}
}
+ @ApiOperation(value = "人员基本信息物理删除")
@DeleteMapping
@PreAuthorize("hasAuthority('empBaseinfo:delete')")
public void deleteEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
@@ -76,9 +111,10 @@
}
}
+ @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) {
@@ -88,9 +124,13 @@
}
}
+ @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) {
@@ -99,13 +139,66 @@
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);
+ }
+ }
+
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpBaseInfo empBaseinfo, HttpServletResponse response) throws IOException {
- // @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);
- // }
+ List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
+ }
+
+ @ApiOperation(value = "导入员工")
+ @PostMapping("importEmp")
+ 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);
+ }
+
+ }
+
+ @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);
+ }
+ }
}
--
Gitblit v1.8.0