From d48f137e71193bd8b3bb39570eca666798fda070 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 19 二月 2021 20:37:03 +0800
Subject: [PATCH] feat(分支合并): 附件管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.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/EmpDimissionAttendController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
index 93bbba2..bbee976 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.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:38
+* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
+@Api(tags = "人员离职当月考勤信息录入接口")
@Slf4j
@Validated
@RestController
-@RequestMapping("empDimissionattend")
+@RequestMapping("empDimissionAttend")
@RequiredArgsConstructor
public class EmpDimissionAttendController {
@@ -53,7 +57,7 @@
try {
this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "新增EmpDimissionattend失败";
+String message = "新增离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +69,19 @@
try {
this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "删除EmpDimissionattend失败";
+String message = "删除离职当月考勤失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empDimissionattend:delete')")
+public void logicDeleteEmpDimissionattend(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empDimissionattendService.logicDelEmpDimissionattend(ids);
+} catch (Exception e) {
+String message = "逻辑删除离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,9 +93,22 @@
try {
this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "修改EmpDimissionattend失败";
+String message = "修改离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "离职当月考勤信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empDimissionattend:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empDimissionattendService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "离职当月考勤信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0