From 61060637cf0c0910b20eaae6fc4992a723214e40 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 25 五月 2021 21:57:30 +0800
Subject: [PATCH] feat(部门信息修改时同步更新人员信息表中的部门):
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index a37f1d1..a2b5c86 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -71,7 +71,7 @@
queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
}
if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
- queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
+ queryWrapper.like("b.allDeptName", empBadrecord.getDeptName());
}
if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
@@ -84,7 +84,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "badDate", FebsConstant.ORDER_ASC, true);
return empBadrecordMapper.selectPageVo(page, queryWrapper);
}
@@ -174,6 +174,9 @@
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBadrecord.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
@@ -184,7 +187,7 @@
returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empBadrecord.setDelFlag(2);
+ empBadrecord.setDelFlag(0);
empBadrecord.setEmpId(empId);
empBadrecord.setDeptName(list.get(1).toString());
empBadrecord.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0