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/EmpContractInfoController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 39a8f76..4626a43 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -6,6 +6,8 @@
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,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -22,13 +25,14 @@
* description:员工合同信息控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:42
+* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
+@Api(tags = "人员合同信息录入接口")
@Slf4j
@Validated
@RestController
-@RequestMapping("empContractinfo")
+@RequestMapping("empContractInfo")
@RequiredArgsConstructor
public class EmpContractInfoController {
@@ -53,7 +57,7 @@
try {
this.empContractinfoService.createEmpContractinfo(empContractinfo);
} catch (Exception e) {
-String message = "新增EmpContractinfo失败";
+String message = "新增员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +69,19 @@
try {
this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
} catch (Exception e) {
-String message = "删除EmpContractinfo失败";
+String message = "删除员工合同信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empContractinfo:delete')")
+public void logicDeleteEmpContractinfo(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empContractinfoService.logicDelEmpContractinfo(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,9 +93,22 @@
try {
this.empContractinfoService.updateEmpContractinfo(empContractinfo);
} catch (Exception e) {
-String message = "修改EmpContractinfo失败";
+String message = "修改员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "合同信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empContractinfo:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empContractinfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "合同信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0