From 1b170de4c1d4bd3f43f7a401fd68e73effd3f464 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 19 二月 2021 17:19:34 +0800
Subject: [PATCH] feat(分支合并): 在职员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 156 +++++++++++++++++++++++++++++++++------------------
1 files changed, 100 insertions(+), 56 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 6cf7521..430a036 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,11 +1,15 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.server.hr.entity.EmpBaseinfo;
+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.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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -13,73 +17,113 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:人员基本信息控制器
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:50
-* @since JDK1.8
-*/
+ * name:EmpBaseInfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-30 08:04:50
+ * @since JDK1.8
+ */
+@Api(tags = "人员基本信息录入接口")
@Slf4j
@Validated
@RestController
-@RequestMapping("empBaseinfo")
+@RequestMapping("empBaseInfo")
@RequiredArgsConstructor
public class EmpBaseInfoController {
-private final IEmpBaseInfoService empBaseinfoService;
+ private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteUserService remoteUserService;
+ private final IRemoteDeptService remoteDeptService;
-@GetMapping
-@PreAuthorize("hasAuthority('empBaseinfo:list')")
-public FebsResponse getAllEmpBaseinfos(EmpBaseinfo empBaseinfo) {
-return new FebsResponse().data(empBaseinfoService.findEmpBaseinfos(empBaseinfo));
-}
+ @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);
+ }
-@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 = "人员基本信息增加")
+ @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 = "新增员工基本信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empBaseinfo:add')")
-public void addEmpBaseinfo(@Valid EmpBaseinfo empBaseinfo) throws FebsException {
-try {
-this.empBaseinfoService.createEmpBaseinfo(empBaseinfo);
-} catch (Exception e) {
-String message = "新增EmpBaseinfo失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "人员基本信息物理删除")
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empBaseinfo:delete')")
+ public void deleteEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
+ try {
+ this.empBaseInfoService.deleteEmpBaseInfo(empBaseinfo);
+ } catch (Exception e) {
+ String message = "删除员工基本信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empBaseinfo:delete')")
-public void deleteEmpBaseinfo(EmpBaseinfo empBaseinfo) throws FebsException {
-try {
-this.empBaseinfoService.deleteEmpBaseinfo(empBaseinfo);
-} catch (Exception e) {
-String message = "删除EmpBaseinfo失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "人员基本信息逻辑删除")
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empBaseinfo:delete')")
+ public void logicDeleteEmpBaseInfo(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empBaseInfoService.logicDelEmpBaseInfo(ids);
+ } catch (Exception e) {
+ String message = "逻辑员工基本信息删除失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empBaseinfo:update')")
-public void updateEmpBaseinfo(EmpBaseinfo empBaseinfo) throws FebsException {
-try {
-this.empBaseinfoService.updateEmpBaseinfo(empBaseinfo);
-} catch (Exception e) {
-String message = "修改EmpBaseinfo失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "人员基本信息修改")
+ @PutMapping
+ @PreAuthorize("hasAuthority('empBaseinfo:update')")
+ 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) {
+ String message = "修改失败";
+ log.error(message, e);
+ 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);
+ }
+ }
+
}
--
Gitblit v1.8.0