From 3d8f7b941393760faa8fb67af9baa95d5c2c8457 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 17:13:39 +0800
Subject: [PATCH] feat(在职员工): 关闭员工档案接口

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java |  129 +++++++++++++++++++++++++-----------------
 1 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
index ee47f87..305fff2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
@@ -1,13 +1,13 @@
 package cc.mrbird.febs.server.hr.controller;
 
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
 import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
 import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 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;
@@ -15,17 +15,20 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import java.util.Map;
 
 /**
- * name:EmpBadrecord
- * package:cc.mrbird.febs.server.hr.controller
- * description:员工不良记录信息控制器
- *
- * @author luoyibo
- * @date 2021-01-24 20:35:55
- * @since JDK1.8
- */
+*
+* name:EmpBadrecord
+* package:cc.mrbird.febs.server.hr.controller
+* description:员工不良记录信息控制器
+*
+* @author luoyibo
+* @date 2021-01-31 11:26:42
+* @since JDK1.8
+*/
+@Api(tags = "人员不良记录录入接口")
 @Slf4j
 @Validated
 @RestController
@@ -33,55 +36,77 @@
 @RequiredArgsConstructor
 public class EmpBadRecordController {
 
-    private final IEmpBadRecordService empBadRecordService;
+private final IEmpBadRecordService empBadrecordService;
 
-    @GetMapping("sequence")
-    public long getSequence(){
-        return SequenceUtil.generateId(0L,ModuleCode.HR_EMPLOYEE);
-    }
-    @GetMapping
-    @PreAuthorize("hasAuthority('empBadrecord:list')")
-    public FebsResponse getAllEmpBadRecords(EmpBadRecord empBadrecord) {
-        return new FebsResponse().data(empBadRecordService.findEmpBadRecords(empBadrecord));
-    }
+@GetMapping
+@PreAuthorize("hasAuthority('empBadrecord:list')")
+public FebsResponse getAllEmpBadrecords(EmpBadRecord empBadrecord) {
+return new FebsResponse().data(empBadrecordService.findEmpBadrecords(empBadrecord));
+}
 
-    @GetMapping("list")
-    @PreAuthorize("hasAuthority('empBadrecord:list')")
-    public FebsResponse empBadRecordList(QueryRequest request, EmpBadRecord empBadrecord) {
-        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadRecordService.findEmpBadRecords(request, empBadrecord));
-        return new FebsResponse().data(dataTable);
-    }
+@GetMapping("list")
+@PreAuthorize("hasAuthority('empBadrecord:list')")
+public FebsResponse empBadrecordList(QueryRequest request, EmpBadRecord empBadrecord) {
+Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadrecordService.findEmpBadrecords(request, empBadrecord));
+return new FebsResponse().data(dataTable);
+}
 
-    @PostMapping
-    @PreAuthorize("hasAuthority('empBadrecord:add')")
-    public void addEmpBadRecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
-        try {
-            this.empBadRecordService.createEmpBadRecord(empBadrecord);
-        } catch (Exception e) {
-            String message = "新增EmpBadrecord失败";
-            log.error(message, e);
-            throw new FebsException(message);
-        }
-    }
+@PostMapping
+@PreAuthorize("hasAuthority('empBadrecord:add')")
+public void addEmpBadrecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
+try {
+this.empBadrecordService.createEmpBadrecord(empBadrecord);
+} catch (Exception e) {
+String message = "新增员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
 
-    @DeleteMapping("{ids}")
+@DeleteMapping
+@PreAuthorize("hasAuthority('empBadrecord:delete')")
+public void deleteEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+try {
+this.empBadrecordService.deleteEmpBadrecord(empBadrecord);
+} catch (Exception e) {
+String message = "删除员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empBadrecord:delete')")
+public void logicDeleteEmpBadrecord(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empBadrecordService.logicDelEmpBadrecord(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@PutMapping
+@PreAuthorize("hasAuthority('empBadrecord:update')")
+public void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+try {
+this.empBadrecordService.updateEmpBadrecord(empBadrecord);
+} catch (Exception e) {
+String message = "修改员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+    @ApiOperation(value = "不良记录信息提交")
+    @DeleteMapping("toNormal/{ids}")
     @PreAuthorize("hasAuthority('empBadrecord:delete')")
-    public void logicDeleteEmpBadRecord(@PathVariable("ids") String ids) throws FebsException {
+    public void momentToNormal(@NotBlank(message = "{required}")  @PathVariable("ids") String ids) throws FebsException {
         try {
-            this.empBadRecordService.logicDelEmpBadRecord(ids);
+            this.empBadrecordService.momentToNormal(ids);
         } catch (Exception e) {
-            String message = "逻辑删除员工不良记录失败";
-            log.error(message, e);
-            throw new FebsException(message);
-        }
-    }
-    @PutMapping
-    @PreAuthorize("hasAuthority('empBadrecord:update')")
-    public void updateEmpBadRecord(EmpBadRecord empBadrecord) throws FebsException {
-        try {
-            this.empBadRecordService.updateEmpBadRecord(empBadrecord);
-        } catch (Exception e) {
-            String message = "修改员工不良记录失败";
+            String message = "不良记录信息提交失败";
             log.error(message, e);
             throw new FebsException(message);
         }

--
Gitblit v1.8.0