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/EmpContractInfoServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 99f9d9c..3341240 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -7,9 +7,11 @@
import java.util.Optional;
import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
@@ -19,15 +21,18 @@
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cn.hutool.core.date.DateUtil;
@@ -49,6 +54,7 @@
private final RedisService redisService;
private final EmpContractInfoMapper empContractinfoMapper;
+ private final IRemoteDeptService remoteDeptService;
private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -56,34 +62,39 @@
@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
- LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
+ QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
- queryWrapper.like(EmpContractInfo::getEmpNumb, empContractinfo.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empContractinfo.getEmpNumb());
}
if (StringUtils.isNotBlank(empContractinfo.getEmpName())) {
- queryWrapper.like(EmpContractInfo::getEmpName, empContractinfo.getEmpName());
+ queryWrapper.like("a.EmpName", empContractinfo.getEmpName());
}
if (StringUtils.isNotBlank(empContractinfo.getCertificateNumb())) {
- queryWrapper.like(EmpContractInfo::getCertificateNumb, empContractinfo.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.like(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
+ queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
}
if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
- queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
+ queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
- queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
+ queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
}
- if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.like(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
- }
+ // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ // queryWrapper.in("a.deptName", empContractinfo.getDeptName());
+ // }
if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
- queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
+ queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
}
+ if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
+ queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<EmpContractInfo> iPage = this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
+ IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
List<EmpContractInfo> list = iPage.getRecords();
//设置字典数据
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -163,15 +174,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpContractInfo contractInfo = new EmpContractInfo();
contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
contractInfo.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
+ 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()));
@@ -182,7 +199,7 @@
returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- contractInfo.setDelFlag(2);
+ contractInfo.setDelFlag(0);
contractInfo.setEmpId(empId);
contractInfo.setDeptName(list.get(1).toString());
contractInfo.setDeptId(dept.getDeptId());
@@ -200,9 +217,14 @@
contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
}
if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
+ contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
}
- contractInfo.setContractStatus(list.get(9).toString());
+ //合同
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ contractInfo.setContractStatus(dicItem.getDicItemCode());
+ }
+
contractInfo.setTransactor(list.get(10).toString());
contractInfo.setRemark(list.get(11).toString());
--
Gitblit v1.8.0