From b55c9f4ddf68de8bade1f4bf627609fb36828ba5 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 31 一月 2021 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lybDevelop' into lybDevelop
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 22 +++++++++++++++++-----
1 files changed, 17 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..84ba129 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
@@ -22,13 +22,13 @@
* description:离职当月考勤控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:38
+* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
-@RequestMapping("empDimissionattend")
+@RequestMapping("empDimissionAttend")
@RequiredArgsConstructor
public class EmpDimissionAttendController {
@@ -53,7 +53,7 @@
try {
this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "新增EmpDimissionattend失败";
+String message = "新增离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,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,7 +89,7 @@
try {
this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "修改EmpDimissionattend失败";
+String message = "修改离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
--
Gitblit v1.8.0