From 7e172d1de04d55caafd86489fa81c06c142adab2 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java | 144 ++++++++++++++++++++++++++---------------------
1 files changed, 79 insertions(+), 65 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
index bdc7bf6..12cc8b5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
@@ -7,6 +7,7 @@
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;
@@ -14,18 +15,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
-*
-* name:EmpUnemployment
-* package:cc.mrbird.febs.server.hr.controller
-* description:失业金领取表控制器
-*
-* @author luoyibo
-* @date 2021-02-01 00:22:28
-* @since JDK1.8
-*/
+ * name:EmpUnemployment
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:失业金领取表控制器
+ *
+ * @author luoyibo
+ * @date 2021-02-01 00:22:28
+ * @since JDK1.8
+ */
@Api(tags = "人员失业金领取信息录入接口")
@Slf4j
@Validated
@@ -34,66 +35,79 @@
@RequiredArgsConstructor
public class EmpUnemploymentController {
-private final IEmpUnemploymentService empUnemploymentService;
+ private final IEmpUnemploymentService empUnemploymentService;
-@GetMapping
-@PreAuthorize("hasAuthority('empUnemployment:list')")
-public FebsResponse getAllEmpUnemployments(EmpUnemployment empUnemployment) {
-return new FebsResponse().data(empUnemploymentService.findEmpUnemployments(empUnemployment));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empUnemployment:list')")
+ public FebsResponse getAllEmpUnemployments(EmpUnemployment empUnemployment) {
+ return new FebsResponse().data(empUnemploymentService.findEmpUnemployments(empUnemployment));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empUnemployment:list')")
-public FebsResponse empUnemploymentList(QueryRequest request, EmpUnemployment empUnemployment) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empUnemploymentService.findEmpUnemployments(request, empUnemployment));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empUnemployment:list')")
+ public FebsResponse empUnemploymentList(QueryRequest request, EmpUnemployment empUnemployment) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empUnemploymentService.findEmpUnemployments(request, empUnemployment));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empUnemployment:add')")
-public void addEmpUnemployment(@Valid EmpUnemployment empUnemployment) throws FebsException {
-try {
-this.empUnemploymentService.createEmpUnemployment(empUnemployment);
-} catch (Exception e) {
-String message = "新增失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empUnemployment:add')")
+ public void addEmpUnemployment(@Valid EmpUnemployment empUnemployment) throws FebsException {
+ try {
+ this.empUnemploymentService.createEmpUnemployment(empUnemployment);
+ } catch (Exception e) {
+ String message = "新增失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empUnemployment:delete')")
-public void deleteEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
-try {
-this.empUnemploymentService.deleteEmpUnemployment(empUnemployment);
-} catch (Exception e) {
-String message = "删除失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empUnemployment:delete')")
+ public void deleteEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ try {
+ this.empUnemploymentService.deleteEmpUnemployment(empUnemployment);
+ } catch (Exception e) {
+ String message = "删除失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empUnemployment:delete')")
-public void logicDeleteEmpUnemployment(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empUnemploymentService.logicDelEmpUnemployment(ids);
-} catch (Exception e) {
-String message = "逻辑删除失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empUnemployment:delete')")
+ public void logicDeleteEmpUnemployment(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empUnemploymentService.logicDelEmpUnemployment(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empUnemployment:update')")
-public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
-try {
-this.empUnemploymentService.updateEmpUnemployment(empUnemployment);
-} catch (Exception e) {
-String message = "修改失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PutMapping
+ @PreAuthorize("hasAuthority('empUnemployment:update')")
+ public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ try {
+ this.empUnemploymentService.updateEmpUnemployment(empUnemployment);
+ } catch (Exception e) {
+ String message = "修改失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "失业金领取信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empUnemployment:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empUnemploymentService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "失业金领取信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0