From 42b094b137f12a70578e3be9920d05f98de823d5 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期一, 22 二月 2021 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 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 664726b..b6b62da 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
@@ -13,6 +13,8 @@
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 com.wuwenze.poi.ExcelKit;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,7 +29,20 @@
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
+import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
+import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
+import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
+import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
+import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
+import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
+import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
+import cc.mrbird.febs.server.hr.service.IEmpResignService;
+import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
+import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cc.mrbird.febs.server.hr.util.PoiImportExcel;
import cn.hutool.core.date.DateUtil;
@@ -54,6 +69,19 @@
public class EmpBaseInfoController {
private final IEmpBaseInfoService empBaseInfoService;
+ private final IEmpWorkExperienceService empWorkExperienceService;
+ private final IEmpPhysicalExamService empPhysicalExamService;
+ private final IEmpContractInfoService empContractInfoService;
+ private final IEmpDimissionAttendService empDimissionAttendService;
+ private final IEmpLeaveInfoService empLeaveInfoService;
+ private final IEmpResignService empResignService;
+ private final IEmpUnemploymentService empUnemploymentService;
+ private final IEmpInsuranceService empInsuranceService;
+ private final IEmpAccidentCasesService empAccidentCasesService;
+ private final IEmpOccupationalService empOccupationalService;
+ private final IEmpLaborTroubleService empLaborTroubleService;
+ private final IEmpBadRecordService empBadRecordService;
+ private final IEmpRemarkinfoService empRemarkinfoService;
private final IRemoteUserService remoteUserService;
private final IRemoteDeptService remoteDeptService;
@@ -154,27 +182,61 @@
@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);
}
- @ApiOperation(value = "导入员工")
+ @ApiOperation(value = "导入员工")
@PostMapping("importEmp")
public void importEmp(MultipartFile file) throws IOException {
InputStream in = null;
- List<List<Object>> listObject = null;
+ List<List<List<Object>>> listObject = null;
try {
if (!file.isEmpty()) {
in = file.getInputStream();
- listObject = new PoiImportExcel().getListByExcel(in, file.getOriginalFilename());
+ listObject = PoiImportExcel.getMulitListByExcel(in, file.getOriginalFilename());
in.close();
- empBaseInfoService.importEmpBaseInfo(listObject);
+ 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.importEmpBadRecord(listObject.get(13));
}
} catch (Exception e) {
log.error("导入员工", e);
}
-
}
+ @ApiOperation(value = "关闭员工档案")
+ @PostMapping("dimission")
+ public void dimissionEmp(EmpDimissionLog empDimissionLog) throws FebsException {
+ try {
+ this.empBaseInfoService.closeEmpArchives(empDimissionLog);
+ } catch (Exception e) {
+ String message = "关闭员工档案失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @ApiOperation(value = "员工岗位变更")
+ @PostMapping("jobChange")
+ public void changeEmpJob(EmpJobChange empJobChange) throws FebsException {
+ try {
+ this.empBaseInfoService.changeEmpJob(empJobChange);
+ } catch (Exception e) {
+ String message = "员工调岗保存失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0