fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计

luoyb

2021-11-05 6d240fbbf6a47b4125320f26c4f5c537e1493fb6

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java

@@ -1,10 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.utils.CastUtil;
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.exception.FebsException;
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.EmpWorkExperience;
@@ -13,20 +16,17 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
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.entity.constant.StringConstant;
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.util.*;

@@ -70,14 +70,14 @@
            queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
            queryWrapper.in("b.EmpStatus", empWorkexperience.getEmpStatus().split(","));
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());

        SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
        return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
    }

@@ -85,26 +85,37 @@
    public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
        if(StringUtils.isNotBlank(empWorkexperience.getEmpNumb())){
            queryWrapper.eq(EmpWorkExperience::getEmpNumb,empWorkexperience.getEmpNumb());
        }
        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) {
    public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
        String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
                .map(u -> u.getUserId().toString())
                .orElse("1");
        empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empWorkexperience.setCreator(operatorId);
        empWorkexperience.setModifier(operatorId);
        this.save(empWorkexperience);
        if(!checkRepetitiveData(empWorkexperience)) {
            empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            if("1".equals(empWorkexperience.getSex())){
                empWorkexperience.setSex("男");
            } else  if("2".equals(empWorkexperience.getSex())){
                empWorkexperience.setSex("女");
            }
            empWorkexperience.setCreator(operatorId);
            empWorkexperience.setModifier(operatorId);
            this.save(empWorkexperience);
        } else {
            throw new FebsException("已存在此工作经历");
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) {
        String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
                .map(u -> u.getUserId().toString())
        String operatorId = Optional.of(FebsUtil.getUserId())
                .orElse("1");
        EmpWorkExperience dbData = this.getById(empWorkexperience.getWorkExperienceId());
        empWorkexperience.setCreateTime(dbData.getCreateTime());
@@ -158,40 +169,52 @@
   @Transactional(rollbackFor = Exception.class)
   public void importEmpWorkExperience(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
            EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
            if (null == empId){
                returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(4).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(4).toString()));
                continue;
            }
         EmpWorkExperience workExperience = new EmpWorkExperience();
            workExperience.setEmpId(empId.getEmpId());
            //工作经历中的部门
            workExperience.setDeptName(list.get(4).toString());
            workExperience.setDeptId(dept.getDeptId());
            //实际部门ID
            workExperience.setDeptId(empId.getDeptId());
         workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         workExperience.setEmpNumb(list.get(0).toString());
         workExperience.setEmpName(list.get(1).toString());
         workExperience.setCertificateNumb(list.get(2).toString());
         workExperience.setSex("男".equals(list.get(3).toString()) ? "1" : "2");
         workExperience.setSex(list.get(3).toString());
         workExperience.setWorkUnit(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
         }
         if (StringUtils.isNotBlank(list.get(6).toString())) {
            workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
         }
         try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    workExperience.setBeginDate(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(6).toString())) {
                    workExperience.setEndDate(DateUtil.parse(list.get(6).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

         workExperience.setJobContent(list.get(7).toString());
         workExperience.setCreator(FebsUtil.getUserId());
         workExperience.setModifier(FebsUtil.getUserId());
         workExperience.setDelFlag(2);
         workExperience.setDelFlag(0);
         this.save(workExperience);
      }
   }

   private boolean checkRepetitiveData(EmpWorkExperience empWorkExperience){
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkExperience.getDelFlag());
        queryWrapper.eq(EmpWorkExperience::getCertificateNumb, empWorkExperience.getCertificateNumb());
        queryWrapper.eq(EmpWorkExperience::getBeginDate,empWorkExperience.getBeginDate());

        return this.list(queryWrapper).size()>0;
    }
}