From a72d1a009bc4068e1ba2890a9730223b9528c2f2 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 21:23:21 +0800
Subject: [PATCH] Merge branch 'lybfixbug'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 135 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 46 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 35b7af3..96dfdee 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,29 +1,40 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
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 com.wuwenze.poi.ExcelKit;
+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;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
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
@@ -31,52 +42,84 @@
@RequiredArgsConstructor
public class EmpBadRecordController {
- private final IEmpBadRecordService empBadrecordService;
+private final IEmpBadRecordService empBadrecordService;
- @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);
+}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpBadRecord empBaseinfo, HttpServletResponse response) {
+ request.setPageSize(this.empBadrecordService.count());
+ List<EmpBadRecord> records = this.empBadrecordService.findEmpBadrecords(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpBadRecord.class, response).downXlsx(records, false);
}
+@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);
+}
+}
- @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);
- }
+@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);
+}
+}
- @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);
- }
- }
+@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);
+}
+}
- @DeleteMapping
+@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 deleteEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
- this.empBadrecordService.deleteEmpBadRecord(empBadrecord);
+ this.empBadrecordService.momentToNormal(ids);
} catch (Exception e) {
- String message = "删除EmpBadrecord失败";
- 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 = "修改EmpBadrecord失败";
+ String message = "不良记录信息提交失败";
log.error(message, e);
throw new FebsException(message);
}
--
Gitblit v1.8.0