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

yijiusmile

2021-03-04 455bf65a36ce1e9b6c24eb5c86a8eb69eaea8003

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

@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
@@ -104,9 +105,9 @@
      LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
      lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
      lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
      if (this.count(lambdaQueryWrapper) > 0) {
         throw new FebsException("当日记录已存在");
         throw new FebsException(MyConstant.MESSAGE);
      }
        empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empLabortrouble.setCreator(operatorId);
@@ -120,10 +121,10 @@
      LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
      lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
      lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
      lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
      if (this.count(lambdaQueryWrapper) > 0) {
         throw new FebsException("当日记录已存在");
         throw new FebsException(MyConstant.MESSAGE);
      }
        EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
        empLabortrouble.setCreateTime(dbData.getCreateTime());
@@ -168,7 +169,7 @@

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