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/EmpRemarkInfoController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
index 2982988..93d1cdd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
@@ -1,7 +1,7 @@
package cc.mrbird.febs.server.hr.controller;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
-import cc.mrbird.febs.server.hr.service.IEmpRemarkInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
@@ -22,7 +22,7 @@
* description:员工备注信息控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:15
+* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
@Slf4j
@@ -32,7 +32,7 @@
@RequiredArgsConstructor
public class EmpRemarkInfoController {
-private final IEmpRemarkInfoService empRemarkinfoService;
+private final IEmpRemarkinfoService empRemarkinfoService;
@GetMapping
@PreAuthorize("hasAuthority('empRemarkinfo:list')")
@@ -53,7 +53,7 @@
try {
this.empRemarkinfoService.createEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
-String message = "新增EmpRemarkinfo失败";
+String message = "新增员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empRemarkinfoService.deleteEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
-String message = "删除EmpRemarkinfo失败";
+String message = "删除员工备注信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empRemarkinfo:delete')")
+public void logicDeleteEmpRemarkinfo(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empRemarkinfoService.logicDelEmpRemarkinfo(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empRemarkinfoService.updateEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
-String message = "修改EmpRemarkinfo失败";
+String message = "修改员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
--
Gitblit v1.8.0