From 0f86fe76d4d4fa5a4fa1e8661c6b40de87cdd2aa Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 15 四月 2021 21:58:37 +0800
Subject: [PATCH] fix(bug修复): 导出pdf时相关证件多选的转换
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 7ac2b2a..191231b 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
@@ -54,8 +54,9 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empWorkExperienceService.findEmpWorkExperiences(request, empWorkexperience));
return new FebsResponse().data(dataTable);
}
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpWorkExperience empBaseinfo, HttpServletResponse response) {
empBaseinfo.setDelFlag(0);
@@ -63,13 +64,14 @@
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);
}
@@ -88,7 +90,6 @@
}
@DeleteMapping("{ids}")
- @PreAuthorize("hasAuthority('empWorkexperience:delete')")
public void logicDeleteEmpWorkExperience(@PathVariable("ids") String ids) throws FebsException {
try {
this.empWorkExperienceService.logicDelEmpWorkExperience(ids);
--
Gitblit v1.8.0