From d014a10a4e597718375c0964f0394babb3eae7d7 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 13 三月 2022 10:02:44 +0800
Subject: [PATCH] fix(bug修复): 增加了定时计算年龄的定时任务
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 f41de30..eb19d36 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
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
@@ -9,6 +10,7 @@
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
import cc.mrbird.febs.server.hr.service.*;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
@@ -20,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -51,7 +54,7 @@
@RequestMapping("empBaseInfo")
@RequiredArgsConstructor
public class EmpBaseInfoController {
-
+ private final IRemoteDeptService remoteDeptService;
private final IEmpBaseInfoService empBaseInfoService;
private final IEmpWorkExperienceService empWorkExperienceService;
private final IEmpPhysicalExamService empPhysicalExamService;
@@ -97,7 +100,11 @@
if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
}
+ if(this.empBaseInfoService.verifyCertificateNumb(empBaseinfo)){
+ throw new FebsException("已存在此身份证号:" + empBaseinfo.getCertificateNumb());
+ }
try {
+ empBaseinfo.setEntryType("20");
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
String message = "新增员工基本信息失败";
@@ -162,10 +169,11 @@
@GetMapping("options")
public FebsResponse roles() {
QueryWrapper<EmpBaseInfo> wrapper=new QueryWrapper();
- wrapper.eq("empStatus",0);
- wrapper.eq("delFlag",0);
- wrapper.orderByDesc("createTime");
- List<EmpBaseInfo> allRoles = empBaseInfoService.list(wrapper);
+ wrapper.eq("a.empStatus",0);
+ wrapper.eq("a.delFlag",0);
+ wrapper.orderByDesc("a.createTime");
+ wrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ List<EmpBaseInfo> allRoles = empBaseInfoService.listAll(wrapper);
return new FebsResponse().data(allRoles);
}
@@ -217,7 +225,7 @@
empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
- empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
+ empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList,dicItems);
empResignService.importEmpResign(listObject.get(6),returnList);
empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);
@@ -227,14 +235,17 @@
empBadRecordService.importEmpBadRecord(listObject.get(12),returnList);
empRemarkinfoService.importEmpRemarkInfo(listObject.get(13),returnList);
}
- } catch (Exception e) {
+ }catch (IndexOutOfBoundsException e){
+ log.error("导入员工,下表越界", e);
+ }catch (Exception e) {
log.error("导入员工", e);
}
- return new FebsResponse().data(returnList);
+ return new FebsResponse().data(returnList);
}
@ApiOperation(value = "关闭员工档案")
@PostMapping("dimission")
+ @PreAuthorize("hasAuthority('empBaseinfo:dimission')")
public void dimissionEmp(EmpDimissionLog empDimissionLog) throws FebsException {
try {
this.empBaseInfoService.closeEmpArchives(empDimissionLog);
@@ -246,6 +257,7 @@
}
@ApiOperation(value = "员工岗位变更")
@PostMapping("jobChange")
+ @PreAuthorize("hasAuthority('empBaseinfo:jobChange')")
public void changeEmpJob(EmpJobChange empJobChange) throws FebsException {
try {
this.empBaseInfoService.changeEmpJob(empJobChange);
--
Gitblit v1.8.0