fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题

luoyb

2024-06-02 f4151abee349597ed58a405a8a5e48a5d1a1f7a6

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

@@ -1,32 +1,33 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;

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.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.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.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
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 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.*;
@@ -67,7 +68,7 @@
            queryWrapper.like("a.CertificateNumb", empDimissionattend.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
            queryWrapper.like("a.DeptName", empDimissionattend.getDeptName());
            queryWrapper.like("b.allDeptName", empDimissionattend.getDeptName());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
            queryWrapper.like("a.AttendYear", empDimissionattend.getAttendYear());
@@ -79,10 +80,11 @@
            queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empDimissionattend.getEmpStatus());
            queryWrapper.in("b.EmpStatus", empDimissionattend.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "attendMonth", FebsConstant.ORDER_ASC, true);
        return empDimissionattendMapper.selectPageVo(page, queryWrapper);
    }

@@ -97,6 +99,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        empDimissionattend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empDimissionattend.setAttendYear(StringUtils.left(empDimissionattend.getAttendMonth(),4));
        empDimissionattend.setCreator(operatorId);
        empDimissionattend.setModifier(operatorId);
        this.save(empDimissionattend);
@@ -106,6 +109,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        EmpDimissionAttend dbData = this.getById(empDimissionattend.getDimissionAttendId());
        empDimissionattend.setAttendYear(StringUtils.left(empDimissionattend.getAttendMonth(),4));
        empDimissionattend.setCreateTime(dbData.getCreateTime());
        empDimissionattend.setCreator(dbData.getCreator());
        empDimissionattend.setDelFlag(dbData.getDelFlag());
@@ -150,13 +154,16 @@
    @Transactional(rollbackFor = Exception.class)
   public void importEmpDimissionAttend(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;
            }
         EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
         dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         dimissionAttend.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()));
@@ -167,14 +174,23 @@
                returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            dimissionAttend.setDelFlag(2);
            dimissionAttend.setDelFlag(0);
            dimissionAttend.setEmpId(empBaseInfo.getEmpId());
         dimissionAttend.setDeptName(list.get(1).toString());
         dimissionAttend.setDeptId(dept.getDeptId());
         dimissionAttend.setJobName(list.get(2).toString());
         dimissionAttend.setEmpName(list.get(3).toString());
         dimissionAttend.setCertificateNumb(list.get(4).toString());
         dimissionAttend.setAttendMonth(list.get(5).toString());
         try {
                if (StringUtils.isNotBlank(list.get(5).toString())){
                    dimissionAttend.setAttendMonth(DateUtil.formatDate(DateUtil.parse(list.get(5).toString())));
                }

            }catch (Exception e){
                returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

         if (StringUtils.isNotBlank(list.get(6).toString())) {
            dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
         }