From 52cf7583cff6a6871d54d5a2cae1aa2a3b6b5bbc Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 16 三月 2021 01:32:40 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 89fe523..76ec259 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,19 +1,26 @@
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;
/**
@@ -48,13 +55,23 @@
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 = "新增员工工作经历失败";
+ String message = "新增员工工作经历失败 "+e.getMessage();
log.error(message, e);
throw new FebsException(message);
}
@@ -95,4 +112,17 @@
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