From 749ad6fe2e845433622992aa0aacd8b0d7714ccc Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 00:34:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 145 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 66 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
index bbee976..0b63f07 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
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;
@@ -14,20 +17,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:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:04
-* @since JDK1.8
-*/
+ * name:EmpDimissionattend
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:离职当月考勤控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:04
+ * @since JDK1.8
+ */
@Api(tags = "人员离职当月考勤信息录入接口")
@Slf4j
@Validated
@@ -36,73 +40,82 @@
@RequiredArgsConstructor
public class EmpDimissionAttendController {
-private final IEmpDimissionAttendService empDimissionattendService;
+ private final IEmpDimissionAttendService empDimissionattendService;
-@GetMapping
-@PreAuthorize("hasAuthority('empDimissionattend:list')")
-public FebsResponse getAllEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
-return new FebsResponse().data(empDimissionattendService.findEmpDimissionattends(empDimissionattend));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:list')")
+ public FebsResponse getAllEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
+ return new FebsResponse().data(empDimissionattendService.findEmpDimissionattends(empDimissionattend));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empDimissionattend:list')")
-public FebsResponse empDimissionattendList(QueryRequest request, EmpDimissionAttend empDimissionattend) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionattendService.findEmpDimissionattends(request, empDimissionattend));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empDimissionattend:list')")
+ public FebsResponse empDimissionattendList(QueryRequest request, EmpDimissionAttend empDimissionattend) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionattendService.findEmpDimissionattends(request, empDimissionattend));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empDimissionattend:add')")
-public void addEmpDimissionattend(@Valid EmpDimissionAttend empDimissionattend) throws FebsException {
-try {
-this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
-} 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, EmpDimissionAttend empBaseinfo, HttpServletResponse response) {
+ request.setPageSize(this.empDimissionattendService.count());
+ List<EmpDimissionAttend> records = this.empDimissionattendService.findEmpDimissionattends(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpDimissionAttend.class, response).downXlsx(records, false);
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empDimissionattend:delete')")
-public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
-try {
-this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
-} catch (Exception e) {
-String message = "删除离职当月考勤失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:add')")
+ public void addEmpDimissionattend(@Valid EmpDimissionAttend empDimissionattend) throws FebsException {
+ try {
+ this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
+ } catch (Exception e) {
+ String message = "新增离职当月考勤失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empDimissionattend:delete')")
-public void logicDeleteEmpDimissionattend(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empDimissionattendService.logicDelEmpDimissionattend(ids);
-} catch (Exception e) {
-String message = "逻辑删除离职当月考勤失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:delete')")
+ public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
+ try {
+ this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
+ } catch (Exception e) {
+ String message = "删除离职当月考勤失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empDimissionattend:update')")
-public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
-try {
-this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
-} catch (Exception e) {
-String message = "修改离职当月考勤失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empDimissionattend:delete')")
+ public void logicDeleteEmpDimissionattend(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empDimissionattendService.logicDelEmpDimissionattend(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除离职当月考勤失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:update')")
+ public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
+ try {
+ this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
+ } catch (Exception e) {
+ String message = "修改离职当月考勤失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "离职当月考勤信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empDimissionattend: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.empDimissionattendService.momentToNormal(ids);
} catch (Exception e) {
--
Gitblit v1.8.0