增加员工基本信息，工作经历的关联查询

yijiusmile

2021-03-04 455bf65a36ce1e9b6c24eb5c86a8eb69eaea8003

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
@@ -87,9 +88,9 @@
        LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
        lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
        lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empBadrecord.setCreator(operatorId);
@@ -103,10 +104,10 @@
        LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
        lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
        lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpBadRecord::getBadId,empBadrecord.getBadId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
        empBadrecord.setCreateTime(dbData.getCreateTime());
@@ -151,7 +152,7 @@

    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpBadRecord(List<List<Object>> listObject) {
    public void importEmpBadRecord(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
          EmpBadRecord empBadrecord=new EmpBadRecord();
          empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));