From db6a13645ba212dee0ef46548cc3468d30b76873 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 24 五月 2021 21:29:05 +0800
Subject: [PATCH] feat(定时更新基本信息表的部门名称与全称):
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 5142ddd..438c23f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -76,7 +76,7 @@
queryWrapper.like("a.CertificateNumb", empLeaveinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
+ queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
@@ -87,7 +87,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "beginTime", FebsConstant.ORDER_ASC, true);
IPage<EmpLeaveInfo> iPage = empLeaveinfoMapper.selectPageVo(page, queryWrapper);
iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
return iPage;
@@ -177,7 +177,7 @@
returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- leaveInfo.setDelFlag(2);
+ leaveInfo.setDelFlag(0);
leaveInfo.setEmpId(empBaseInfo.getEmpId());
leaveInfo.setDeptName(list.get(1).toString());
leaveInfo.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0