From 78378b0b89cd550489e4187931055001dd0e745d Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 24 二月 2021 19:00:11 +0800
Subject: [PATCH] 新增附件管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 9decba8..31cf086 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -98,7 +98,7 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findEmpBaseInfos(request, empBaseinfo));
return new FebsResponse().data(dataTable);
}
-
+
@ApiOperation(value = "智搜人员基本信息翻页列表")
@GetMapping("zslist")
@PreAuthorize("hasAuthority('empBaseinfo:list')")
@@ -115,7 +115,6 @@
throw new FebsException("已存在此员工编号");
}
try {
- //EmpBaseInfo tempInfo = this.empBaseInfoService.
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
String message = "新增员工基本信息失败";
@@ -177,12 +176,12 @@
throw new FebsException(message);
}
}
-
+
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpBaseInfo empBaseinfo, HttpServletResponse response) throws IOException {
-
+ request.setPageSize(this.empBaseInfoService.count());
List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
}
@@ -210,7 +209,7 @@
empOccupationalService.importEmpOccupational(listObject.get(10));
empLaborTroubleService.importEmpLaborTrouble(listObject.get(11));
empBadRecordService.importEmpBadRecord(listObject.get(12));
- empRemarkinfoService.importEmpBadRecord(listObject.get(13));
+ empRemarkinfoService.importEmpRemarkInfo(listObject.get(13));
}
} catch (Exception e) {
log.error("导入员工", e);
@@ -239,4 +238,16 @@
throw new FebsException(message);
}
}
+
+ @GetMapping("image/{empId}")
+ public void getImage(@PathVariable String empId, HttpServletResponse response) throws FebsException {
+ try {
+ this.empBaseInfoService.getImage(empId,response);
+ } catch (Exception e) {
+ String message = "获取员工图片异常";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+
+ }
}
--
Gitblit v1.8.0