数据权限加到考勤情况位置

yijiusmile

2021-03-04 6328f096bc75d835ecf6c25f58f1a452b8800a86

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

@@ -2,6 +2,7 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -10,6 +11,7 @@
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
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;
@@ -93,9 +95,9 @@
        LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
        lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
        lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
        lambdaQueryWrapper.ne(EmpInsurance::getDelFlag, 1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("此人已在本日期申请过社保");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empInsurance.setCreator(operatorId);
@@ -109,10 +111,10 @@
        LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
        lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
        lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
        lambdaQueryWrapper.ne(EmpInsurance::getDelFlag, 1);
        lambdaQueryWrapper.ne(EmpInsurance::getInsuranceId,empInsurance.getInsuranceId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("此人已在本日期申请过社保");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
        empInsurance.setCreateTime(dbData.getCreateTime());
@@ -157,16 +159,22 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpInsurance(List<List<Object>> listObject) {
    public void importEmpInsurance(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpInsurance empInsurance = new EmpInsurance();
            empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empInsurance.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empInsurance.setDeptName(list.get(1).toString());
            empInsurance.setDeptId(deptId);
            empInsurance.setDeptId(dept.getDeptId());
            empInsurance.setJobName(list.get(2).toString());
            empInsurance.setEmpName(list.get(3).toString());
            empInsurance.setCertificateNumb(list.get(4).toString());