From 0cdf00c2c4a7ab80bba2a09a17e1372ef8aa15dd Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 08 三月 2021 13:12:18 +0800
Subject: [PATCH] fix(bug修复): 查询功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 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 520855b..33d0676 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
@@ -11,10 +11,12 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cn.hutool.core.annotation.AnnotationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;
@@ -99,7 +101,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')")
@@ -113,7 +115,7 @@
@PreAuthorize("hasAuthority('empBaseinfo:add')")
public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
- throw new FebsException("已存在此员工编号");
+ throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
}
try {
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
@@ -186,7 +188,7 @@
List<EmpBaseInfo> allRoles = empBaseInfoService.list(wrapper);
return new FebsResponse().data(allRoles);
}
-
+
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
@@ -195,7 +197,7 @@
List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
}
-
+
@ApiOperation(value = "导出员工")
@RequestMapping(value = "exportWithField",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
@@ -211,34 +213,43 @@
boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "exportEmpAll",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException {
+ this.empBaseInfoService.exportEmpAll(response,empBaseinfo);
+ }
+
@ApiOperation(value = "导入员工")
@PostMapping("importEmp")
- public void importEmp(MultipartFile file) throws IOException {
- InputStream in = null;
- List<List<List<Object>>> listObject = null;
+ public FebsResponse importEmp(MultipartFile file) {
+ InputStream in;
+ List<List<List<Object>>> listObject;
+ List<String> returnList = new ArrayList<>();
try {
if (!file.isEmpty()) {
in = file.getInputStream();
listObject = PoiImportExcel.getMulitListByExcel(in, file.getOriginalFilename());
in.close();
- empBaseInfoService.importEmpBaseInfo(listObject.get(0));
- empWorkExperienceService.importEmpWorkExperience(listObject.get(1));
- empPhysicalExamService.importEmpPhysicalExam(listObject.get(2));
- empContractInfoService.importEmpContractInfo(listObject.get(3));
- empDimissionAttendService.importEmpDimissionAttend(listObject.get(4));
- empLeaveInfoService.importEmpLeaveInfo(listObject.get(5));
- empResignService.importEmpResign(listObject.get(6));
- empUnemploymentService.importEmpUnemployment(listObject.get(7));
- empInsuranceService.importEmpInsurance(listObject.get(8));
- empAccidentCasesService.importEmpAccidentCases(listObject.get(9));
- empOccupationalService.importEmpOccupational(listObject.get(10));
- empLaborTroubleService.importEmpLaborTrouble(listObject.get(11));
- empBadRecordService.importEmpBadRecord(listObject.get(12));
- empRemarkinfoService.importEmpRemarkInfo(listObject.get(13));
+ empBaseInfoService.importEmpBaseInfo(listObject.get(0),returnList);
+ empWorkExperienceService.importEmpWorkExperience(listObject.get(1),returnList);
+ empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList);
+ empContractInfoService.importEmpContractInfo(listObject.get(3),returnList);
+ empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
+ empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
+ empResignService.importEmpResign(listObject.get(6),returnList);
+ empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
+ empInsuranceService.importEmpInsurance(listObject.get(8),returnList);
+ empAccidentCasesService.importEmpAccidentCases(listObject.get(9),returnList);
+ empOccupationalService.importEmpOccupational(listObject.get(10),returnList);
+ empLaborTroubleService.importEmpLaborTrouble(listObject.get(11),returnList);
+ empBadRecordService.importEmpBadRecord(listObject.get(12),returnList);
+ empRemarkinfoService.importEmpRemarkInfo(listObject.get(13),returnList);
}
} catch (Exception e) {
log.error("导入员工", e);
}
+ return new FebsResponse().data(returnList);
}
@ApiOperation(value = "关闭员工档案")
@@ -275,4 +286,17 @@
}
}
+
+ @ApiOperation(value = "在职人员基本信息增加")
+ @PostMapping("addInEmp")
+ @PreAuthorize("hasAuthority('empBaseinfo:add')")
+ public FebsResponse addInEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
+ try {
+ return new FebsResponse().data(empBaseInfoService.addInEmpBaseInfo(empBaseinfo));
+ } catch (Exception e) {
+ String message = "新增员工基本信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0