From 49a2f509d6a114c062b966a5bab83f45980e808f Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 12 五月 2021 15:30:49 +0800
Subject: [PATCH] fix(bug修复): 入离职记录智搜无法按姓名查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 318 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 195 insertions(+), 123 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 42ea780..ccdb128 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
@@ -24,6 +24,7 @@
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -92,7 +93,7 @@
@Override
public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "entryDate", FebsConstant.ORDER_ASC, true);
IPage<EmpBaseInfo> iPage = empBaseInfoMapper.selectPageVo(page, createQueryWrapper(empBaseInfo));
//设置部门
// List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -156,6 +157,7 @@
.findFirst()
.map(DicItem::getDicItemName)
.orElse(""));
+ p.setCertificateListName(getCertificateListName(p.getCertificateList(),dicItems));
});
iPage.setRecords(list);
return iPage;
@@ -173,8 +175,11 @@
public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
+ Long empId = SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE);
+ boolean saveDimissionLog = true;
if (dbInfo == null) {
- empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empBaseInfo.setEmpId(empId);
+ // saveDimissionLog = true;
} else {
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
@@ -188,13 +193,24 @@
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
+
+ EmpDimissionLog dimissionLog = new EmpDimissionLog();
+ dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionLog.setEmpId(empId);
+ dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
+ dimissionLog.setDimissionType("20");
+ dimissionLog.setRemark(empBaseInfo.getRemark());
+ dimissionLog.setCreator(operatorId);
+ dimissionLog.setModifier(operatorId);
+
+ dimissionLogService.save(dimissionLog);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpBaseInfo(EmpBaseInfo empBaseInfo) {
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
- if (StrUtil.isNotBlank(empBaseInfo.getImagePath())) {
+ if (StrUtil.isNotBlank(empBaseInfo.getImagePath()) && empBaseInfo.getImagePath().indexOf(",") > 0) {
String path = properties.getEmpBaseInfoPath() + empBaseInfo.getEmpId() + ".png";
if (MyUtil.generateImage(empBaseInfo.getImagePath(), path)) {
empBaseInfo.setImagePath(empBaseInfo.getEmpId() + ".png");
@@ -207,10 +223,10 @@
empBaseInfo.setDelFlag(dbData.getDelFlag());
empBaseInfo.setModifyTime(new Date());
empBaseInfo.setModifier(operatorId);
- if(StringUtils.isBlank(empBaseInfo.getImagePath())){
+ if (StringUtils.isBlank(empBaseInfo.getImagePath())) {
empBaseInfo.setImagePath(dbData.getImagePath());
}
- if(StringUtils.isBlank(empBaseInfo.getAllDeptName())){
+ if (StringUtils.isBlank(empBaseInfo.getAllDeptName())) {
empBaseInfo.setAllDeptName(dbData.getAllDeptName());
}
this.saveOrUpdate(empBaseInfo);
@@ -243,22 +259,22 @@
//同步删除关联数据
//不良记录
- empBadRecordMapper.logicDelByUserIds(list,operatorId);
- empAccidentCasesMapper.logicDelByUserIds(list,operatorId);
- empContractInfoMapper.logicDelByUserIds(list,operatorId);
- empDimissionAttendMapper.logicDelByUserIds(list,operatorId);
- empDimissionLogMapper.logicDelByUserIds(list,operatorId);
- empInsuranceMapper.logicDelByUserIds(list,operatorId);
- empJobChangeMapper.logicDelByUserIds(list,operatorId);
- empLaborTroubleMapper.logicDelByUserIds(list,operatorId);
- empLeaveInfoMapper.logicDelByUserIds(list,operatorId);
- empOccupationalMapper.logicDelByUserIds(list,operatorId);
- empOpenArchivesMapper.logicDelByUserIds(list,operatorId);
- empPhysicalExamMapper.logicDelByUserIds(list,operatorId);
- empRemarkInfoMapper.logicDelByUserIds(list,operatorId);
- empResignMapper.logicDelByUserIds(list,operatorId);
- empUnemploymentMapper.logicDelByUserIds(list,operatorId);
- empWorkExperienceMapper.logicDelByUserIds(list,operatorId);
+ empBadRecordMapper.logicDelByUserIds(list, operatorId);
+ empAccidentCasesMapper.logicDelByUserIds(list, operatorId);
+ empContractInfoMapper.logicDelByUserIds(list, operatorId);
+ empDimissionAttendMapper.logicDelByUserIds(list, operatorId);
+ empDimissionLogMapper.logicDelByUserIds(list, operatorId);
+ empInsuranceMapper.logicDelByUserIds(list, operatorId);
+ empJobChangeMapper.logicDelByUserIds(list, operatorId);
+ empLaborTroubleMapper.logicDelByUserIds(list, operatorId);
+ empLeaveInfoMapper.logicDelByUserIds(list, operatorId);
+ empOccupationalMapper.logicDelByUserIds(list, operatorId);
+ empOpenArchivesMapper.logicDelByUserIds(list, operatorId);
+ empPhysicalExamMapper.logicDelByUserIds(list, operatorId);
+ empRemarkInfoMapper.logicDelByUserIds(list, operatorId);
+ empResignMapper.logicDelByUserIds(list, operatorId);
+ empUnemploymentMapper.logicDelByUserIds(list, operatorId);
+ empWorkExperienceMapper.logicDelByUserIds(list, operatorId);
}
/**
@@ -272,8 +288,8 @@
*/
private List<EmpBaseInfo> setDeptName(List<EmpBaseInfo> empBaseInfoList) {
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
for (EmpBaseInfo empBaseInfo : empBaseInfoList) {
// 设置部门
@@ -433,7 +449,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList,List<DicItem> dicItems) {
+ public void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
for (List<Object> list : listObject) {
if (list.size() == 0) {
continue;
@@ -448,11 +464,11 @@
empBaseInfo.setEmpNumb(list.get(1).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
empBaseInfo.setDeptName(list.get(2).toString());
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(2).toString())).findFirst().orElse(null);
@@ -465,33 +481,48 @@
empBaseInfo.setDeptId(dept.getDeptId());
List<Position> positionList = CastUtil.castList(redisService.get("position"), Position.class);
- if (null==positionList){
+ if (null == positionList) {
positionList = remotePositionService.setPositionRedis();
- if (null==positionList){
+ if (null == positionList) {
returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}获取岗位为空，请设置岗位", listObject.indexOf(list) + 1, list.get(3).toString()));
continue;
}
}
Position position = positionList.stream().filter(d -> d.getPositionName().equals(list.get(3).toString())).findFirst().orElse(null);
- if (null == position){
+ if (null == position) {
returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}获取岗位为空", listObject.indexOf(list) + 1, list.get(3).toString()));
continue;
}
empBaseInfo.setJobId(position.getPositionId());
empBaseInfo.setJobName(list.get(3).toString());
empBaseInfo.setEmpName(list.get(4).toString());
- empBaseInfo.setCertificateNumb(list.get(5).toString());
+ try {
+ if (StrUtil.isNotBlank(list.get(5).toString())) {
+ empBaseInfo.setCertificateNumb(list.get(5).toString());
+ if (IdcardUtil.isValidCard(list.get(5).toString())) {
+ empBaseInfo.setAge(IdcardUtil.getAgeByIdCard(list.get(5).toString()));
+ empBaseInfo.setBirthdate(IdcardUtil.getBirthDate(list.get(5).toString()));
+ }
+ }
+
+ } catch (Exception e) {
+ log.error("导入人员身份证异常：{}", e);
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}检查身份证是否正确", listObject.indexOf(list) + 1, list.get(5).toString()));
+ continue;
+ }
+
+
empBaseInfo.setSex("男".equals(list.get(6).toString()) ? "1" : "2");
//民族
- DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"nation")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "nation") && StrUtil.equals(j.getDicItemName(), list.get(7).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setNation(dicItem.getDicItemCode());
}
//婚姻状况
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"marriage")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "marriage") && StrUtil.equals(j.getDicItemName(), list.get(8).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setMarriage(dicItem.getDicItemCode());
}
@@ -499,8 +530,8 @@
empBaseInfo.setStature(Integer.valueOf(list.get(9).toString()));
}
//政治面貌
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(), "plitical")&&StrUtil.equals(j.getDicItemName(),list.get(10).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "plitical") && StrUtil.equals(j.getDicItemName(), list.get(10).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setPolitics(dicItem.getDicItemCode());
}
@@ -509,26 +540,26 @@
}
//最高学历
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"education")&&StrUtil.equals(j.getDicItemName(),list.get(12).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "education") && StrUtil.equals(j.getDicItemName(), list.get(12).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setEducation(dicItem.getDicItemCode());
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empBaseInfo.setSeniority(Integer.valueOf(list.get(13).toString()));
+ empBaseInfo.setSeniority(list.get(13).toString());
}
//籍贯
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"nativePlace")&&StrUtil.equals(j.getDicItemName(),list.get(14).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "nativePlace") && StrUtil.equals(j.getDicItemName(), list.get(14).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setNativePlace(dicItem.getDicItemCode());
}
empBaseInfo.setCensusAddress(list.get(15).toString());
empBaseInfo.setCurrentAddress(list.get(16).toString());
//员工类型
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"empType")&&StrUtil.equals(j.getDicItemName(),list.get(17).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "empType") && StrUtil.equals(j.getDicItemName(), list.get(17).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setEmpType(dicItem.getDicItemCode());
}
@@ -539,8 +570,8 @@
empBaseInfo.setBankName(list.get(22).toString());
empBaseInfo.setBankNumb(list.get(23).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){
+ 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());
}
@@ -548,43 +579,43 @@
empBaseInfo.setFamily(list.get(26).toString());
empBaseInfo.setUrgencyPhone(list.get(27).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){
+ 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){
+ 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());
}
//相关证件
List<DicItem> dicItemList = new ArrayList<>();
String[] certificateList = list.get(30).toString().split(StringConstant.COMMA);
- if (null != certificateList){
+ if (null != certificateList) {
for (String s : certificateList) {
- dicItem = dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"certificateList")&&StrUtil.equals(j.getDicItemName(),s)).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "certificateList") && StrUtil.equals(j.getDicItemName(), s)).findFirst().orElse(null);
+ if (null != dicItem) {
dicItemList.add(dicItem);
}
}
}
- if(CollUtil.isNotEmpty(dicItemList)){
- empBaseInfo.setCertificateList(dicItemList.stream().map(i->i.getDicItemCode()).collect(Collectors.joining(StringConstant.COMMA)));
+ if (CollUtil.isNotEmpty(dicItemList)) {
+ empBaseInfo.setCertificateList(dicItemList.stream().map(i -> i.getDicItemCode()).collect(Collectors.joining(StringConstant.COMMA)));
}
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){
+ 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());
}
//档案情况
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"archivesStatus")&&StrUtil.equals(j.getDicItemName(),list.get(32).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "archivesStatus") && StrUtil.equals(j.getDicItemName(), list.get(32).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
empBaseInfo.setArchivesStatus(dicItem.getDicItemCode());
}
empBaseInfo.setEmpStatus("0");
@@ -607,17 +638,17 @@
inputStream.read(buff);
inputStream.close();
- String contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().indexOf(".")+1);
- if (contentType.equals("tif")){
+ String contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().lastIndexOf(".") + 1);
+ if (contentType.equals("tif")) {
//设置发送到客户端的响应内容类型
response.setContentType("image/tiff");
- }else if (contentType.equals("bmp")){
+ } else if (contentType.equals("bmp")) {
response.setContentType("application/x-bmp");
- }else if (contentType.equals("jpg")){
+ } else if (contentType.equals("jpg")) {
response.setContentType("image/jpeg");
- }else if (contentType.equals("gif")){
+ } else if (contentType.equals("gif")) {
response.setContentType("image/gif");
- }else{
+ } else {
response.setContentType("image/png");
}
out.write(buff);
@@ -636,25 +667,25 @@
womanOld = sysConfig.get(1).getConfigValue();
}
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
+ List<String> lists = Arrays.asList(split);
if ("1".equals(number)) { //在职员工
- iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index, btime, etime, name, lists);
} else if ("2".equals(number)) { //新进员工
- iPage = this.empBaseInfoMapper.xjbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.xjbaseInfoList(page, index, btime, etime, name, lists);
} else if ("3".equals(number)) { //正式员工
- iPage = this.empBaseInfoMapper.zsbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.zsbaseInfoList(page, index, btime, etime, name, lists);
} else if ("4".equals(number)) { //临时员工
- iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index, btime, etime, name, lists);
} else if ("5".equals(number)) { //超龄员工
- iPage = this.empBaseInfoMapper.clbaseInfoList(page, index, btime, etime, name, manOld, womanOld,lists);
+ iPage = this.empBaseInfoMapper.clbaseInfoList(page, index, btime, etime, name, manOld, womanOld, lists);
} else if ("6".equals(number)) { //离职员工总数
- iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index, btime, etime, name, lists);
} else if ("7".equals(number)) { //辞职申请人数
- iPage = this.empBaseInfoMapper.cjbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.cjbaseInfoList(page, index, btime, etime, name, lists);
} else if ("8".equals(number) || "9".equals(number) || "10".equals(number)) { //正常离职人数 ,自动离职人数 ,公司辞退人数
- iPage = this.empBaseInfoMapper.zcbaseInfoList(page, index, btime, etime, name, number,lists);
+ iPage = this.empBaseInfoMapper.zcbaseInfoList(page, index, btime, etime, name, number, lists);
} else if ("11".equals(number)) { //身份证到期
- iPage = this.empBaseInfoMapper.sfzbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.sfzbaseInfoList(page, index, btime, etime, name, lists);
}
//设置部门
List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -719,13 +750,13 @@
Page<EmpBaseInfo> page = new Page<EmpBaseInfo>(new Long(pageNum), new Long(pageSize));
IPage<EmpBaseInfo> iPage = null;
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
+ List<String> lists = Arrays.asList(split);
if ("11".equals(number) || "13".equals(number) || "14".equals(number)) { //有效合同 ,新签合同,续签合同
- iPage = this.empBaseInfoMapper.yxbaseInfoList(page, index, btime, etime, name, number,lists);
+ iPage = this.empBaseInfoMapper.yxbaseInfoList(page, index, btime, etime, name, number, lists);
} else if ("12".equals(number)) { //到期合同
- iPage = this.empBaseInfoMapper.dqbaseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.dqbaseInfoList(page, index, btime, etime, name, lists);
} else if ("15".equals(number)) { //解除合同
- iPage = this.empBaseInfoMapper.jcseInfoList(page, index, btime, etime, name,lists);
+ iPage = this.empBaseInfoMapper.jcseInfoList(page, index, btime, etime, name, lists);
}
//设置部门
List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -750,8 +781,8 @@
IPage<EmpDimissionAttend> iPage = null;
//q出勤人数 员工加班 员工旷工
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoCqList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoCqList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -762,8 +793,8 @@
IPage<EmpLeaveInfo> iPage = null;
//员工请假
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoQjList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoQjList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -773,8 +804,8 @@
IPage<EmpPhysicalExam> iPage = null;
//员工体检
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoTjList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoTjList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -784,8 +815,8 @@
IPage<EmpLaborTrouble> iPage = null;
//劳资案件
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoLzList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoLzList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -795,8 +826,8 @@
IPage<EmpJobChange> iPage = null;
//调岗
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoTgList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoTgList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -806,8 +837,8 @@
IPage<EmpOccupational> iPage = null;
//工伤案件
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoGsList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoGsList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -817,8 +848,8 @@
IPage<EmpAccidentCases> iPage = null;
//意外险案件
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoYwList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoYwList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -828,8 +859,8 @@
IPage<EmpInsurance> iPage = null;
//社保
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoSbList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoSbList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -839,8 +870,8 @@
IPage<EmpUnemployment> iPage = null;
//失业金
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoSyjList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoSyjList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -850,8 +881,8 @@
IPage<EmpBadRecord> iPage = null;
//不良记录
String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
- List<String> lists= Arrays.asList(split);
- iPage = this.empBaseInfoMapper.empBaseInfoBlList(page, index, btime, etime, name, number,lists);
+ List<String> lists = Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoBlList(page, index, btime, etime, name, number, lists);
return iPage;
}
@@ -864,19 +895,19 @@
manOld = sysConfig.get(0).getConfigValue();
womanOld = sysConfig.get(1).getConfigValue();
}
- QueryWrapper queryWrapper=new QueryWrapper();
+ QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.in("t1.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
//在职员工,正式员工，临时员工，超龄员工
- Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index, btime, etime, manOld, womanOld,queryWrapper);
+ Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index, btime, etime, manOld, womanOld, queryWrapper);
//正常离职，自动离职，公司辞退 判断条件创建日期
- Map<String, Object> zclzObjectMap = this.baseMapper.countZcygBaseInfoList(index, btime, etime,queryWrapper);
+ Map<String, Object> zclzObjectMap = this.baseMapper.countZcygBaseInfoList(index, btime, etime, queryWrapper);
if (zclzObjectMap != null) {
stringObjectMap.put("zclz", zclzObjectMap.get("zclz").toString());
stringObjectMap.put("zdlz", zclzObjectMap.get("zdlz").toString());
stringObjectMap.put("gsct", zclzObjectMap.get("gsct").toString());
}
//新进员工 判断条件入职日期
- Integer xjygObjectMap = this.baseMapper.countXjygBaseInfoList(index, btime, etime,queryWrapper);
+ Integer xjygObjectMap = this.baseMapper.countXjygBaseInfoList(index, btime, etime, queryWrapper);
if (xjygObjectMap != null) {
stringObjectMap.put("xjyg", xjygObjectMap);
}
@@ -889,34 +920,34 @@
stringObjectMap.put("lzyg", empStatus);
}
//解除合同 判断条件离职申请日期
- Map<String, Object> lzygObjectMap = this.baseMapper.countLzygBaseInfoList(index, btime, etime,queryWrapper);
+ Map<String, Object> lzygObjectMap = this.baseMapper.countLzygBaseInfoList(index, btime, etime, queryWrapper);
if (lzygObjectMap != null) {
stringObjectMap.put("jcht", lzygObjectMap.get("jcht").toString());
}
//辞职申请员工总数 判断条件辞职申请日期
- Integer czygObjectMap = this.baseMapper.countCzygBaseInfoList(index, btime, etime,queryWrapper);
+ Integer czygObjectMap = this.baseMapper.countCzygBaseInfoList(index, btime, etime, queryWrapper);
if (czygObjectMap != null) {
stringObjectMap.put("czyg", czygObjectMap);
}
//有效合同 判断条件合同签订日期
- Map<String, Object> yxhtObjectMap = this.baseMapper.countYxhtBaseInfoList(index, btime, etime,queryWrapper);
+ Map<String, Object> yxhtObjectMap = this.baseMapper.countYxhtBaseInfoList(index, btime, etime, queryWrapper);
if (yxhtObjectMap != null) {
stringObjectMap.put("yxht", yxhtObjectMap.get("yxht").toString());
}
//新签合同，续签合同 判断条件合同签订日期
- Map<String, Object> xqhtObjectMap = this.baseMapper.countXqhtBaseInfoList(index, btime, etime,queryWrapper);
+ Map<String, Object> xqhtObjectMap = this.baseMapper.countXqhtBaseInfoList(index, btime, etime, queryWrapper);
if (yxhtObjectMap != null) {
stringObjectMap.put("xinqht", xqhtObjectMap.get("xinqht").toString());
stringObjectMap.put("xqht", xqhtObjectMap.get("xqht").toString());
}
//到期合同 判断条件合同结束时间
- Integer dqhtObjectMap = this.baseMapper.countDqhtBaseInfoList(index, btime, etime,queryWrapper);
+ Integer dqhtObjectMap = this.baseMapper.countDqhtBaseInfoList(index, btime, etime, queryWrapper);
if (dqhtObjectMap != null) {
stringObjectMap.put("dqht", dqhtObjectMap);
}
//出勤人数，员工加班，员工旷工 判断条件考勤月份 本年，本月
- Map<String, Object> cqrsObjectMap = this.baseMapper.countCqrsBaseInfoList(index, btime, etime,queryWrapper);
+ Map<String, Object> cqrsObjectMap = this.baseMapper.countCqrsBaseInfoList(index, btime, etime, queryWrapper);
if (cqrsObjectMap != null) {
stringObjectMap.put("cqrs", cqrsObjectMap.get("cqrs").toString());
stringObjectMap.put("ygjb", cqrsObjectMap.get("ygjb").toString());
@@ -924,51 +955,51 @@
}
//员工请假 判断条件到岗时间
- Integer ygqjObjectMap = this.baseMapper.countYgqjBaseInfoList(index, btime, etime,queryWrapper);
+ Integer ygqjObjectMap = this.baseMapper.countYgqjBaseInfoList(index, btime, etime, queryWrapper);
if (ygqjObjectMap != null) {
stringObjectMap.put("ygqj", ygqjObjectMap);
}
//劳资案件 判断条件仲裁日期
- Integer lzajObjectMap = this.baseMapper.countLzajBaseInfoList(index, btime, etime,queryWrapper);
+ Integer lzajObjectMap = this.baseMapper.countLzajBaseInfoList(index, btime, etime, queryWrapper);
if (lzajObjectMap != null) {
stringObjectMap.put("lzaj", lzajObjectMap);
}
//工伤案件，意外险案件 判断条件受伤日期
- Map<String, Object> gsajObjectMap = this.baseMapper.countGsajBaseInfoList(index, btime, etime,queryWrapper);
+ Map<String, Object> gsajObjectMap = this.baseMapper.countGsajBaseInfoList(index, btime, etime, queryWrapper);
if (gsajObjectMap != null) {
stringObjectMap.put("gsaj", gsajObjectMap.get("gsaj").toString());
stringObjectMap.put("ywxaj", gsajObjectMap.get("ywxaj").toString());
}
//社保申请 判断条件社保申请日期
- Integer sbsqObjectMap = this.baseMapper.countSbsqBaseInfoList(index, btime, etime,queryWrapper);
+ Integer sbsqObjectMap = this.baseMapper.countSbsqBaseInfoList(index, btime, etime, queryWrapper);
if (sbsqObjectMap != null) {
stringObjectMap.put("sbsq", sbsqObjectMap);
}
//失业金领取 判断条件失业金申请日期
- Integer syjObjectMap = this.baseMapper.countSyjBaseInfoList(index, btime, etime,queryWrapper);
+ Integer syjObjectMap = this.baseMapper.countSyjBaseInfoList(index, btime, etime, queryWrapper);
if (syjObjectMap != null) {
stringObjectMap.put("syj", syjObjectMap);
}
//员工体检 判断条件体检日期
- Integer ygtjObjectMap = this.baseMapper.countYgtjBaseInfoList(index, btime, etime,queryWrapper);
+ Integer ygtjObjectMap = this.baseMapper.countYgtjBaseInfoList(index, btime, etime, queryWrapper);
if (ygtjObjectMap != null) {
stringObjectMap.put("ygtj", ygtjObjectMap);
}
//身份证到期 判断条件身份证有效时间
- Integer sfzObjectMap = this.baseMapper.countSfzBaseInfoList(index, btime, etime,queryWrapper);
+ Integer sfzObjectMap = this.baseMapper.countSfzBaseInfoList(index, btime, etime, queryWrapper);
if (sfzObjectMap != null) {
stringObjectMap.put("sfz", sfzObjectMap);
}
//员工调岗 判断条件身份证有效时间
- Integer ygtgObjectMap = this.baseMapper.countYgtgBaseInfoList(index, btime, etime,queryWrapper);
+ Integer ygtgObjectMap = this.baseMapper.countYgtgBaseInfoList(index, btime, etime, queryWrapper);
if (ygtgObjectMap != null) {
stringObjectMap.put("ygtg", ygtgObjectMap);
}
//不良记录 判断条件身份证有效时间
- Integer bljlObjectMap = this.baseMapper.countBljlBaseInfoList(index, btime, etime,queryWrapper);
+ Integer bljlObjectMap = this.baseMapper.countBljlBaseInfoList(index, btime, etime, queryWrapper);
if (bljlObjectMap != null) {
stringObjectMap.put("bljl", bljlObjectMap);
}
@@ -1103,11 +1134,24 @@
queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
}
if (StringUtils.isNotBlank(empBaseInfo.getInOutType())) {
- queryWrapper.and(p->{
+ queryWrapper.and(p -> {
p.in("a.dimissionType", empBaseInfo.getInOutType().split(","));
- p.or().in("a.entryType",empBaseInfo.getInOutType().split(","));
+ p.or().in("a.entryType", empBaseInfo.getInOutType().split(","));
});
//queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getCertificateList())) {
+ String[] certificates = empBaseInfo.getCertificateList().split(",");
+ Consumer<QueryWrapper<EmpBaseInfo>> consumer = new Consumer<QueryWrapper<EmpBaseInfo>>() {
+ @Override
+ public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
+ for (int i = 0; i < certificates.length; i++) {
+ String ageBtn = certificates[i];
+ wrapper.or().like("a.certificateList", ageBtn);
+ }
+ }
+ };
+ queryWrapper.and(consumer);
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
return queryWrapper;
@@ -1117,6 +1161,7 @@
public EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo) {
EmpBaseInfo dbEmpInfo = this.getEmpBaseInfo(empBaseInfo);
if (dbEmpInfo == null) {
+ empBaseInfo.setDelFlag(0);
this.createEmpBaseInfo(empBaseInfo);
return null;
} else {
@@ -1300,8 +1345,9 @@
public boolean verifyCertificateNumb(EmpBaseInfo empBaseInfo) {
QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb())
- .ne(EmpBaseInfo::getDelFlag, 1);;
- if (empBaseInfo.getEmpId()!=null) {
+ .ne(EmpBaseInfo::getDelFlag, 1);
+ ;
+ if (empBaseInfo.getEmpId() != null) {
queryWrapper.lambda().ne(EmpBaseInfo::getEmpId, empBaseInfo.getEmpId());
}
@@ -1312,4 +1358,30 @@
public List<EmpBaseInfo> listAll(QueryWrapper<EmpBaseInfo> wrapper) {
return this.baseMapper.listAll(wrapper);
}
+
+ private String getCertificateListName(String certificateList, List<DicItem> dicItems) {
+ String tempName;
+ List<String> nameList = new ArrayList<>();
+ String[] tempList = certificateList.split(",");
+ if (tempList.length > 0) {
+ for (int i = 0, len = tempList.length; i < len; i++) {
+ String tempValue = tempList[i];
+ tempName = dicItems.stream()
+ .filter(k -> DicCode.CERTIFICATE_LIST.equals(k.getDicCode()) && k.getDicItemCode().equals(tempValue))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse(tempValue);
+ nameList.add(tempName);
+ }
+ tempName = nameList.stream().collect(Collectors.joining(", "));
+ } else {
+ tempName = "";
+ }
+ return tempName;
+ }
+
+ @Override
+ public boolean updateSeniority() {
+ return empBaseInfoMapper.updateSeniority()>0;
+ }
}
--
Gitblit v1.8.0