From 3cadfe55e0dcec2a02786956ad2776258e0e736c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 19 九月 2024 19:27:05 +0800
Subject: [PATCH] fix: 问题修复 1.合同提醒时间范围
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 153 +++++++++++++++++++++++++++++----------------------
1 files changed, 87 insertions(+), 66 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 305fff2..7f9d237 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,11 +1,17 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+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 cn.hutool.core.util.StrUtil;
+import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,20 +20,21 @@
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-31 11:26:42
-* @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
@@ -36,73 +43,87 @@
@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);
-}
+ @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 = "新增员工不良记录信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @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);
+ }
-@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 = "新增员工不良记录信息失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
+ 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
+ @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);
+ }
+ }
-@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);
-}
-}
+ @DeleteMapping("{ids}")
+ 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 = "修改员工不良记录信息失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "不良记录信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empBadrecord:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empBadrecordService.momentToNormal(ids);
} catch (Exception e) {
--
Gitblit v1.8.0