xx

孔祥富

2021-03-15 8267e418274f9a9ea6b99c2aecb111cd98948cfd

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

@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
@@ -9,6 +11,7 @@
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 org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -79,10 +82,11 @@
            queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
            queryWrapper.eq("a.EmpStatus", empDimissionattend.getEmpStatus());
            queryWrapper.in("a.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, "createTime", FebsConstant.ORDER_DESC, true);
        return empDimissionattendMapper.selectPageVo(page, queryWrapper);
    }

@@ -162,19 +166,22 @@
                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;
            }
            dimissionAttend.setDelFlag(2);
            dimissionAttend.setEmpId(empId);
            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());
         if (StringUtils.isNotBlank(list.get(5).toString())){
                dimissionAttend.setAttendMonth(DateUtil.formatDate(DateUtil.parse(list.get(5).toString())));
            }

         if (StringUtils.isNotBlank(list.get(6).toString())) {
            dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
         }
@@ -192,6 +199,7 @@
            dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
         }
         dimissionAttend.setRemark(list.get(12).toString());
         dimissionAttend.setEmpStatus(empBaseInfo.getEmpStatus());
         this.save(dimissionAttend);
      }
   }