From 8267e418274f9a9ea6b99c2aecb111cd98948cfd Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 15 三月 2021 17:57:11 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 99 +++++++++++++++++++++----------------------------
1 files changed, 43 insertions(+), 56 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 1f33669..a5a6390 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
@@ -1,60 +1,41 @@
package cc.mrbird.febs.server.hr.controller;
+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;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+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;
+import cc.mrbird.febs.server.hr.util.PoiImportExcel;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.wuwenze.poi.ExcelKit;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-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.DicItem;
-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 cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
-import cn.hutool.core.annotation.AnnotationUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.wuwenze.poi.ExcelKit;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import cc.mrbird.febs.common.core.entity.FebsResponse;
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.exception.FebsException;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-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;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
/**
* name:EmpBaseInfo
@@ -72,7 +53,7 @@
@RequestMapping("empBaseInfo")
@RequiredArgsConstructor
public class EmpBaseInfoController {
-
+ private final IRemoteDeptService remoteDeptService;
private final IEmpBaseInfoService empBaseInfoService;
private final IEmpWorkExperienceService empWorkExperienceService;
private final IEmpPhysicalExamService empPhysicalExamService;
@@ -117,6 +98,9 @@
public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
+ }
+ if(this.empBaseInfoService.verifyCertificateNumb(empBaseinfo)){
+ throw new FebsException("已存在此身份证号:" + empBaseinfo.getCertificateNumb());
}
try {
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
@@ -183,10 +167,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);
}
@@ -248,10 +233,12 @@
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 = "关闭员工档案")
--
Gitblit v1.8.0