From 41f5434217c77cb0fd87b08008876f7a5be5af55 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期三, 17 二月 2021 15:42:05 +0800
Subject: [PATCH] 提交用戶管理字段
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 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 c5c8daa..73916b6 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,7 +1,6 @@
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.common.core.entity.system.Role;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
@@ -10,6 +9,9 @@
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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -17,6 +19,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -28,6 +32,7 @@
* @date 2021-01-30 08:04:50
* @since JDK1.8
*/
+@Api(tags = "人员基本信息录入接口")
@Slf4j
@Validated
@RestController
@@ -38,23 +43,37 @@
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);
}
-
+ @GetMapping("options")
+ public FebsResponse roles() {
+ QueryWrapper<EmpBaseInfo> queryWrapper=new QueryWrapper();
+ queryWrapper.eq("delFlag",0);
+ queryWrapper.eq("empStatus",0);
+ List<EmpBaseInfo> allRoles = empBaseInfoService.list(queryWrapper);
+ return new FebsResponse().data(allRoles);
+ }
+ @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 = "新增员工基本信息失败";
@@ -63,6 +82,7 @@
}
}
+ @ApiOperation(value = "人员基本信息物理删除")
@DeleteMapping
@PreAuthorize("hasAuthority('empBaseinfo:delete')")
public void deleteEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
@@ -75,9 +95,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) {
@@ -87,9 +108,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) {
@@ -98,13 +123,17 @@
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 FebsResponse getRemoteDeptList(QueryRequest request, Dept dept) {
- return remoteDeptService.deptList(request, dept);
- }
}
--
Gitblit v1.8.0