From 44cca7956f99c8960fbdf877f78695221f8bcb17 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 05 五月 2024 21:24:41 +0800
Subject: [PATCH] fix: 问题修复 1.数据统计模块中查看合同出错
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 152 insertions(+), 14 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 870adfb..6955b7e 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
@@ -1,21 +1,37 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+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.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.core.utils.SortUtil;
+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;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
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.entity.QueryRequest;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -32,23 +48,52 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpLeaveInfoServiceImpl extends ServiceImpl<EmpLeaveInfoMapper, EmpLeaveInfo> implements IEmpLeaveInfoService {
+ private final RedisService redisService;
private final EmpLeaveInfoMapper empLeaveinfoMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
- public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
- LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ public IPage<EmpLeaveInfo> findEmpLeaveInfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
+ QueryWrapper<EmpLeaveInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empLeaveinfo.getDelFlag());
+ if (StringUtils.isNotBlank(empLeaveinfo.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empLeaveinfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getEmpName())) {
+ queryWrapper.like("a.EmpName", empLeaveinfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empLeaveinfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
+ queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);
+ queryWrapper.le("a.EndTime", empLeaveinfo.getLeaveDateStr().split(",")[1]);
+ }
+ if(StringUtils.isNotBlank(empLeaveinfo.getLeaveType())){
+ queryWrapper.eq("a.leaveType", empLeaveinfo.getLeaveType());
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "beginTime", FebsConstant.ORDER_ASC, true);
+ IPage<EmpLeaveInfo> iPage = empLeaveinfoMapper.selectPageVo(page, queryWrapper);
+ iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
+ return iPage;
}
@Override
- public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
+ public List<EmpLeaveInfo> findEmpLeaveInfos(EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +142,97 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empLeaveinfoMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empLeaveinfoMapper.momentToNormal(list, operatorId)>0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
+ continue;
+ }
+ EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
+ leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ leaveInfo.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()));
+ continue;
+ }
+ 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(0);
+ leaveInfo.setEmpId(empBaseInfo.getEmpId());
+ leaveInfo.setDeptName(list.get(1).toString());
+ leaveInfo.setDeptId(dept.getDeptId());
+ leaveInfo.setJobName(list.get(2).toString());
+ leaveInfo.setEmpName(list.get(3).toString());
+ leaveInfo.setCertificateNumb(list.get(4).toString());
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ leaveInfo.setBeginTime(DateUtil.parse(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ leaveInfo.setEndTime(DateUtil.parse(list.get(6).toString()));
+ }
+
+ if (StringUtils.isNotBlank(list.get(9).toString())) {
+ leaveInfo.setReturnDate(DateUtil.parse(list.get(9).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
+ }
+ //请假类型
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"leavetype")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ leaveInfo.setLeaveType(dicItem.getDicItemCode());
+ }
+
+ leaveInfo.setReporter(list.get(10).toString());
+ leaveInfo.setRemark(list.get(11).toString());
+ leaveInfo.setEmpStatus(empBaseInfo.getEmpStatus());
+ this.save(leaveInfo);
+ }
+ }
+
+ /**
+ *
+ * 将列表中的字典项转换成字典名称
+ *
+ * date 2021-02-26 19:37
+ * @author: luoyibo
+ * @param list 1
+ * @return java.util.List<cc.mrbird.febs.server.hr.entity.EmpLeaveInfo>
+ */
+ private List<EmpLeaveInfo> convertDicItemName(List<EmpLeaveInfo> list){
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ //请假类型
+ p.setLeaveTypeName(dicItems.stream()
+ .filter(k -> DicCode.LEAVE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("事假"));
+ });
+
+ return list;
+ }
+}
--
Gitblit v1.8.0