From fda3f979616e3c5e26993ec7033900cd188ea296 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 129 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 34 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 07a5060..1af47de 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -97,19 +97,21 @@
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<EmpBaseInfo> iPage = empBaseInfoMapper.selectPageVo(page, createQueryWrapper(empBaseInfo));
//设置部门
- List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
+ // List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
+ List<EmpBaseInfo> list = iPage.getRecords();
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
list.forEach(p -> {
p.setSexName("1".equals(p.getSex()) ? "男" : "女");
p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
p.setEmpCardStatusName("1".equals(p.getEmpCardStatus()) ? "未发" : "已发");
p.setHandbookStatusName("1".equals(p.getHandbookStatus()) ? "未发" : "已发");
+ p.setEmpStatusName("0".equals(p.getEmpStatus()) ? "在职" : "离职");
//保险类型
p.setInsuranceTypeName(dicItems.stream()
.filter(k -> DicCode.INSURANCETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceType()))
.findFirst()
.map(DicItem::getDicItemName)
- .orElse("汉族"));
+ .orElse("未知"));
//员工类别
p.setEmpTypeName(dicItems.stream()
.filter(k -> DicCode.EMPTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEmpType()))
@@ -150,12 +152,12 @@
.filter(k -> DicCode.IN_OUT_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEntryType()))
.findFirst()
.map(DicItem::getDicItemName)
- .orElse("未知"));
+ .orElse(""));
p.setDimissionTypeName(dicItems.stream()
.filter(k -> DicCode.IN_OUT_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getDimissionType()))
.findFirst()
.map(DicItem::getDicItemName)
- .orElse("未知"));
+ .orElse(""));
});
iPage.setRecords(list);
return iPage;
@@ -253,6 +255,11 @@
.filter(k -> k.getDeptId().equals(empBaseInfo.getDeptId()))
.findFirst()
.map(Dept::getDeptName)
+ .orElse(""));
+ empBaseInfo.setAllDeptName(depts.stream()
+ .filter(k -> k.getDeptId().equals(empBaseInfo.getDeptId()))
+ .findFirst()
+ .map(Dept::getAllDeptName)
.orElse(""));
}
return empBaseInfoList;
@@ -401,7 +408,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList) {
+ public void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList,List<DicItem> dicItems) {
for (List<Object> list : listObject) {
if (list.size() == 0) {
continue;
@@ -414,33 +421,59 @@
empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBaseInfo.setArchivesNumb(list.get(0).toString());
empBaseInfo.setEmpNumb(list.get(1).toString());
- empBaseInfo.setEmpName(list.get(2).toString());
+
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- empBaseInfo.setDeptName(list.get(3).toString());
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ empBaseInfo.setDeptName(list.get(2).toString());
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(2).toString())).findFirst().orElse(null);
if (null == dept) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(3).toString()));
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(2).toString()));
continue;
}
+ empBaseInfo.setEmpName(list.get(3).toString());
empBaseInfo.setDeptId(dept.getDeptId());
empBaseInfo.setJobName(list.get(4).toString());
empBaseInfo.setEmpType(list.get(5).toString());
empBaseInfo.setSex("男".equals(list.get(6).toString()) ? "1" : "2");
empBaseInfo.setNation(list.get(7).toString());
empBaseInfo.setCertificateNumb(list.get(8).toString());
- empBaseInfo.setMarriage(list.get(9).toString());
+
+ //婚姻状况
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"marriage")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setMarriage(dicItem.getDicItemCode());
+ }
+
if (StringUtils.isNotBlank(list.get(10).toString())) {
empBaseInfo.setStature(Integer.valueOf(list.get(10).toString()));
}
- empBaseInfo.setPolitics(list.get(11).toString());
+
+ //政治面貌
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"politics")&&StrUtil.equals(j.getDicItemName(),list.get(11).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setPolitics(dicItem.getDicItemCode());
+ }
+
+
if (StringUtils.isNotBlank(list.get(12).toString())) {
empBaseInfo.setEntryDate(DateUtil.parseDate(list.get(12).toString()));
}
- empBaseInfo.setEducation(list.get(13).toString());
+
+ //最高学历
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"education")&&StrUtil.equals(j.getDicItemName(),list.get(13).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setEducation(dicItem.getDicItemCode());
+ }
+
+
if (StringUtils.isNotBlank(list.get(14).toString())) {
empBaseInfo.setSeniority(Integer.valueOf(list.get(14).toString()));
}
- empBaseInfo.setNativePlace(list.get(15).toString());
+ //籍贯
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"nativePlace")&&StrUtil.equals(j.getDicItemName(),list.get(15).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setNativePlace(dicItem.getDicItemCode());
+ }
+
empBaseInfo.setCensusAddress(list.get(16).toString());
empBaseInfo.setCurrentAddress(list.get(17).toString());
empBaseInfo.setGuardNumb(list.get(18).toString());
@@ -449,14 +482,35 @@
empBaseInfo.setIntroducer(list.get(21).toString());
empBaseInfo.setBankName(list.get(22).toString());
empBaseInfo.setBankNumb(list.get(23).toString());
- empBaseInfo.setInsuranceType(list.get(24).toString());
+ //保险类型
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"insuranceType")&&StrUtil.equals(j.getDicItemName(),list.get(24).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setInsuranceType(dicItem.getDicItemCode());
+ }
+
empBaseInfo.setSocialNumb(list.get(25).toString());
empBaseInfo.setFamily(list.get(26).toString());
empBaseInfo.setUrgencyPhone(list.get(27).toString());
- empBaseInfo.setHandbookStatus(list.get(28).toString());
- empBaseInfo.setEmpCardStatus(list.get(29).toString());
+ //员工手册
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"handbookStatus")&&StrUtil.equals(j.getDicItemName(),list.get(28).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setHandbookStatus(dicItem.getDicItemCode());
+ }
+
+ //工作证
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"empCardStatus")&&StrUtil.equals(j.getDicItemName(),list.get(29).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setEmpCardStatus(dicItem.getDicItemCode());
+ }
+
+
empBaseInfo.setCertificateList(list.get(30).toString());
empBaseInfo.setDelFlag(2);
+ //入职类型
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"lztype")&&StrUtil.equals(j.getDicItemName(),list.get(31).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empBaseInfo.setEntryType(dicItem.getDicItemCode());
+ }
empBaseInfo.setEmpStatus("0");
this.save(empBaseInfo);
}
@@ -855,8 +909,8 @@
if (StringUtils.isNotBlank(empBaseInfo.getBaseKey())) {
queryWrapper.and(p -> {
p.like("a.EmpNumb", empBaseInfo.getBaseKey());
- p.or().like("a.EmpName", empBaseInfo.getBaseKey());
- p.or().like("a.DeptName", empBaseInfo.getBaseKey());
+ p.or().like("a.allDeptName", empBaseInfo.getBaseKey());
+ p.or().like("a.empName", empBaseInfo.getBaseKey());
p.or().like("a.CertificateNumb", empBaseInfo.getBaseKey());
p.or().like("a.archivesNumb", empBaseInfo.getBaseKey());
p.or().like("a.stature", empBaseInfo.getBaseKey());
@@ -880,7 +934,7 @@
queryWrapper.like("a.EmpName", empBaseInfo.getEmpName());
}
if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empBaseInfo.getDeptName());
+ queryWrapper.like("a.allDeptName", empBaseInfo.getDeptName());
}
if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
queryWrapper.like("a.CertificateNumb", empBaseInfo.getCertificateNumb());
@@ -933,6 +987,13 @@
}
if (StringUtils.isNotBlank(empBaseInfo.getDimissionType())) {
queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getInOutType())) {
+ queryWrapper.and(p->{
+ p.in("a.dimissionType", empBaseInfo.getInOutType().split(","));
+ p.or().in("a.entryType",empBaseInfo.getInOutType().split(","));
+ });
+ //queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
return queryWrapper;
@@ -991,14 +1052,14 @@
List<EmpBaseInfo> exportList = this.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
List<Map<String, Object>> listMapDicItem = new ArrayList();
listMapDicItem.add(map);
- String exportField = FebsUtil.reflectAnnotation(EmpBaseInfo.class);
- List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
+ String exportField = "archivesNumb, deptName, jobName, empName, certificateNumb, certificateValidity, sexName, nationName, age, marriageName, stature, birthdate, politicsName, empTypeName, educationName, nativePlaceName, censusAddress, currentAddress, guardNumb, returnReceipt, archivesStatusName, bankName, bankNumb, telePhone, entryDate, InsuranceTypeName, socialNumb, introducer, seniority, empCardStatusName, certificateList, urgencyPhone, handbookStatusName, family, empStatusName, dimissionDate";
+ List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, null);
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
List<Long> empIds = exportList.stream().map(i -> i.getEmpId()).collect(Collectors.toList());
//工作经历
IPage<EmpWorkExperience> workExperienceIPage = empWorkExperienceMapper.selectPageVo(page, new QueryWrapper<EmpWorkExperience>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (workExperienceIPage.getRecords().size()!=0){
+ if (workExperienceIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpWorkExperience.class);
List<Map<String, Object>> allListEmpWork = PoiExportExcel.getDataList(exportField, workExperienceIPage.getRecords(), listMapDicItem);
allList.add(allListEmpWork.get(0));
@@ -1007,7 +1068,7 @@
//体检信息
IPage<EmpPhysicalExam> empPhysicalExamIPage = empPhysicalExamMapper.selectPageVo(page, new QueryWrapper<EmpPhysicalExam>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empPhysicalExamIPage.getRecords().size()!=0){
+ if (empPhysicalExamIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpWorkExperience.class);
List<Map<String, Object>> allListEmpPhysical = PoiExportExcel.getDataList(exportField, empPhysicalExamIPage.getRecords(), listMapDicItem);
allList.add(allListEmpPhysical.get(0));
@@ -1016,7 +1077,7 @@
//调岗记录
IPage<EmpJobChange> jobChangeIPage = empJobChangeMapper.selectPageVoBean(page, new QueryWrapper<EmpJobChange>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (jobChangeIPage.getRecords().size()!=0){
+ if (jobChangeIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpJobChange.class);
List<Map<String, Object>> allListjobChangeI = PoiExportExcel.getDataList(exportField, jobChangeIPage.getRecords(), listMapDicItem);
allList.add(allListjobChangeI.get(0));
@@ -1025,7 +1086,7 @@
//合同信息
IPage<EmpContractInfo> empContractInfoIPage = empContractInfoMapper.selectPageVo(page, new QueryWrapper<EmpContractInfo>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empContractInfoIPage.getRecords().size()!=0){
+ if (empContractInfoIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpContractInfo.class);
List<Map<String, Object>> allListEmpContractInfo = PoiExportExcel.getDataList(exportField, empContractInfoIPage.getRecords(), listMapDicItem);
allList.add(allListEmpContractInfo.get(0));
@@ -1034,7 +1095,7 @@
//入离职记录
IPage<EmpDimissionAttend> empDimissionAttendIPage = empDimissionAttendMapper.selectPageVo(page, new QueryWrapper<EmpDimissionAttend>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empDimissionAttendIPage.getRecords().size()!=0){
+ if (empDimissionAttendIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpDimissionAttend.class);
List<Map<String, Object>> allListEmpDimissionAtt = PoiExportExcel.getDataList(exportField, empDimissionAttendIPage.getRecords(), listMapDicItem);
allList.add(allListEmpDimissionAtt.get(0));
@@ -1043,7 +1104,7 @@
//请假记录
IPage<EmpLeaveInfo> empLeaveInfoIPage = empLeaveInfoMapper.selectPageVo(page, new QueryWrapper<EmpLeaveInfo>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empLeaveInfoIPage.getRecords().size()!=0){
+ if (empLeaveInfoIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpLeaveInfo.class);
List<Map<String, Object>> allListEmpLoeaveInfo = PoiExportExcel.getDataList(exportField, empLeaveInfoIPage.getRecords(), listMapDicItem);
allList.add(allListEmpLoeaveInfo.get(0));
@@ -1053,7 +1114,7 @@
//失业金领取
IPage<EmpUnemployment> empUnemploymentIPage = empUnemploymentMapper.selectPageVo(page, new QueryWrapper<EmpUnemployment>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empUnemploymentIPage.getRecords().size()!=0){
+ if (empUnemploymentIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpUnemployment.class);
List<Map<String, Object>> allListEmpUnemployment = PoiExportExcel.getDataList(exportField, empUnemploymentIPage.getRecords(), listMapDicItem);
allList.add(allListEmpUnemployment.get(0));
@@ -1062,7 +1123,7 @@
//社保申请
IPage<EmpInsurance> empInsuranceIPage = empInsuranceMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empInsuranceIPage.getRecords().size()!=0){
+ if (empInsuranceIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpInsurance.class);
List<Map<String, Object>> allListEmpInsurance = PoiExportExcel.getDataList(exportField, empInsuranceIPage.getRecords(), listMapDicItem);
allList.add(allListEmpInsurance.get(0));
@@ -1072,7 +1133,7 @@
//意外险案件
IPage<EmpAccidentCases> empAccidentCasesIPage = empAccidentCasesMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empAccidentCasesIPage.getRecords().size()!=0){
+ if (empAccidentCasesIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpAccidentCases.class);
List<Map<String, Object>> allListEmpAccidentCases = PoiExportExcel.getDataList(exportField, empAccidentCasesIPage.getRecords(), listMapDicItem);
allList.add(allListEmpAccidentCases.get(0));
@@ -1081,7 +1142,7 @@
//工伤案件
IPage<EmpOccupational> empOccupationalIPage = empOccupationalMapper.selectPageVo(page, new QueryWrapper<EmpOccupational>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empOccupationalIPage.getRecords().size()!=0){
+ if (empOccupationalIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpOccupational.class);
List<Map<String, Object>> allListEmpOccupational = PoiExportExcel.getDataList(exportField, empOccupationalIPage.getRecords(), listMapDicItem);
allList.add(allListEmpOccupational.get(0));
@@ -1090,7 +1151,7 @@
//劳资案件
IPage<EmpLaborTrouble> empLaborTroubleIPage = empLaborTroubleMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empLaborTroubleIPage.getRecords().size()!=0){
+ if (empLaborTroubleIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpLaborTrouble.class);
List<Map<String, Object>> allListEmpLaborTrouble = PoiExportExcel.getDataList(exportField, empLaborTroubleIPage.getRecords(), listMapDicItem);
allList.add(allListEmpLaborTrouble.get(0));
@@ -1100,7 +1161,7 @@
//不良记录
IPage<EmpBadRecord> empBadRecordIPage = empBadRecordMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empBadRecordIPage.getRecords().size()!=0){
+ if (empBadRecordIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpBadRecord.class);
List<Map<String, Object>> allListEmpBadRecord = PoiExportExcel.getDataList(exportField, empBadRecordIPage.getRecords(), listMapDicItem);
allList.add(allListEmpBadRecord.get(0));
@@ -1110,7 +1171,7 @@
//备注信息
IPage<EmpRemarkInfo> empRemarkInfoIPage = empRemarkInfoMapper.selectPageVo(page, new QueryWrapper<EmpRemarkInfo>().in("a.empId", empIds).ne("a.delFlag", 1));
- if (empRemarkInfoIPage.getRecords().size()!=0){
+ if (empRemarkInfoIPage.getRecords().size() != 0) {
exportField = FebsUtil.reflectAnnotation(EmpRemarkInfo.class);
List<Map<String, Object>> allListEmpRemarkInfo = PoiExportExcel.getDataList(exportField, empRemarkInfoIPage.getRecords(), listMapDicItem);
allList.add(allListEmpRemarkInfo.get(0));
--
Gitblit v1.8.0