修改bug

yz_08

2021-03-23 352f4d4a3ae3145f2bd43d0802150877349750d6

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

@@ -4,10 +4,13 @@
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.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpOpenArchives;
import cc.mrbird.febs.server.hr.mapper.EmpOpenArchivesMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
import cc.mrbird.febs.server.hr.service.IEmpOpenArchivesService;
import cn.hutool.core.date.DateUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -38,6 +41,7 @@

    private final EmpOpenArchivesMapper empOpenarchivesMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IEmpDimissionLogService dimissionLogService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");
@@ -70,9 +74,22 @@
        empBaseInfo.setEntryDate(empOpenarchives.getOpenDate());
        empBaseInfo.setEntryType(empOpenarchives.getOpenType());
        empBaseInfo.setEmpStatus("0");
        empBaseInfo.setDimissionType("");
        empBaseInfo.setDimissionDate(DateUtil.parse("1900-01-01"));
        empBaseInfo.setModifyTime(new Date());
        empBaseInfo.setModifier(operatorId);
        empBaseInfoService.saveOrUpdate(empBaseInfo);

        EmpDimissionLog dimissionLog = new EmpDimissionLog();
        dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        dimissionLog.setEmpId(empOpenarchives.getEmpId());
        dimissionLog.setEntryDate(empOpenarchives.getOpenDate());
        dimissionLog.setDimissionType(empOpenarchives.getOpenType());
        dimissionLog.setRemark(empOpenarchives.getRemark());
        dimissionLog.setCreator(operatorId);
        dimissionLog.setModifier(operatorId);

        dimissionLogService.save(dimissionLog);
    }

    @Override