From c5cf095903c50112f71612272911d53e9c86b7e0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 12 三月 2021 09:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 9c469b1..ad29d74 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
@@ -7,6 +7,8 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -28,6 +30,7 @@
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
@@ -76,7 +79,7 @@
queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empLeaveinfo.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);
@@ -84,6 +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);
IPage<EmpLeaveInfo> iPage = empLeaveinfoMapper.selectPageVo(page, queryWrapper);
iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
return iPage;
@@ -165,13 +169,13 @@
returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
- Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
leaveInfo.setDelFlag(2);
- leaveInfo.setEmpId(empId);
+ leaveInfo.setEmpId(empBaseInfo.getEmpId());
leaveInfo.setDeptName(list.get(1).toString());
leaveInfo.setDeptId(dept.getDeptId());
leaveInfo.setJobName(list.get(2).toString());
@@ -186,12 +190,13 @@
if (StringUtils.isNotBlank(list.get(7).toString())) {
leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
}
- leaveInfo.setLeaveType(list.get(8).toString());
+ leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
if (StringUtils.isNotBlank(list.get(9).toString())) {
leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
}
leaveInfo.setReporter(list.get(10).toString());
leaveInfo.setRemark(list.get(11).toString());
+ leaveInfo.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(leaveInfo);
}
}
@@ -210,7 +215,7 @@
list.forEach(p -> {
//请假类型
p.setLeaveTypeName(dicItems.stream()
- .filter(k -> DicCode.LEAVETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
+ .filter(k -> DicCode.LEAVE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
.findFirst()
.map(DicItem::getDicItemName)
.orElse("事假"));
--
Gitblit v1.8.0