From 6d05ae432c4d76e521e031a76232a6dd1b0ff105 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 09:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 151 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 55 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
index e232d55..7ac2b2a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
@@ -1,85 +1,126 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
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:EmpWorkexperinece
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工作经历控制器
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:04
-* @since JDK1.8
-*/
+ * name:EmpWorkexperience
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工作经历控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-28 12:33:31
+ * @since JDK1.8
+ */
+@Api(tags = "人员工伤经历信息录入接口")
@Slf4j
@Validated
@RestController
-@RequestMapping("empWorkexperinece")
+@RequestMapping("empWorkExperience")
@RequiredArgsConstructor
public class EmpWorkExperienceController {
-private final IEmpWorkExperienceService empWorkexperineceService;
+ private final IEmpWorkExperienceService empWorkExperienceService;
-@GetMapping
-@PreAuthorize("hasAuthority('empWorkexperinece:list')")
-public FebsResponse getAllEmpWorkexperineces(EmpWorkExperience empWorkexperinece) {
-return new FebsResponse().data(empWorkexperineceService.findEmpWorkexperineces(empWorkexperinece));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empWorkexperience:list')")
+ public FebsResponse getAllEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
+ return new FebsResponse().data(empWorkExperienceService.findEmpWorkExperiences(empWorkexperience));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empWorkexperinece:list')")
-public FebsResponse empWorkexperineceList(QueryRequest request, EmpWorkExperience empWorkexperinece) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empWorkexperineceService.findEmpWorkexperineces(request, empWorkexperinece));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empWorkexperience:list')")
+ public FebsResponse empWorkExperienceList(QueryRequest request, EmpWorkExperience empWorkexperience) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empWorkExperienceService.findEmpWorkExperiences(request, empWorkexperience));
+ return new FebsResponse().data(dataTable);
+ }
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpWorkExperience empBaseinfo, HttpServletResponse response) {
+ empBaseinfo.setDelFlag(0);
+ request.setPageSize(this.empWorkExperienceService.count());
+ List<EmpWorkExperience> records = this.empWorkExperienceService.findEmpWorkExperiences(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpWorkExperience.class, response).downXlsx(records, false);
+ }
+ @PostMapping
+ @PreAuthorize("hasAuthority('empWorkexperience:add')")
+ public void addEmpWorkExperience(@Valid EmpWorkExperience empWorkexperience) throws FebsException {
+ try {
+ this.empWorkExperienceService.createEmpWorkExperience(empWorkexperience);
+ } catch (Exception e) {
+ String message = "新增员工工作经历失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empWorkexperinece:add')")
-public void addEmpWorkexperinece(@Valid EmpWorkExperience empWorkexperinece) throws FebsException {
-try {
-this.empWorkexperineceService.createEmpWorkexperinece(empWorkexperinece);
-} catch (Exception e) {
-String message = "新增EmpWorkexperinece失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empWorkexperience:delete')")
+ public void deleteEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
+ try {
+ this.empWorkExperienceService.deleteEmpWorkExperience(empWorkexperience);
+ } catch (Exception e) {
+ String message = "删除员工工作经历失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empWorkexperinece:delete')")
-public void deleteEmpWorkexperinece(EmpWorkExperience empWorkexperinece) throws FebsException {
-try {
-this.empWorkexperineceService.deleteEmpWorkexperinece(empWorkexperinece);
-} catch (Exception e) {
-String message = "删除EmpWorkexperinece失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empWorkexperience:delete')")
+ public void logicDeleteEmpWorkExperience(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empWorkExperienceService.logicDelEmpWorkExperience(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工工作经历失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empWorkexperinece:update')")
-public void updateEmpWorkexperinece(EmpWorkExperience empWorkexperinece) throws FebsException {
-try {
-this.empWorkexperineceService.updateEmpWorkexperinece(empWorkexperinece);
-} catch (Exception e) {
-String message = "修改EmpWorkexperinece失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PutMapping
+ @PreAuthorize("hasAuthority('empWorkexperience:update')")
+ public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
+ try {
+ this.empWorkExperienceService.updateEmpWorkExperience(empWorkexperience);
+ } catch (Exception e) {
+ String message = "修改员工工作经历失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "工作简历信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empWorkexperience:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empWorkExperienceService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "工作简历信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0