修改bug

yz_08

2021-03-03 ce96649e79bf730aef73f3bec205c1c00a743635

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

@@ -58,7 +58,7 @@
            queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
            queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
            queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
        }
        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
@@ -129,8 +129,11 @@

    @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpWorkExperience(List<List<Object>> listObject) {
   public void importEmpWorkExperience(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
         EmpWorkExperience workExperience = new EmpWorkExperience();
         workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         workExperience.setEmpNumb(list.get(0).toString());
@@ -142,10 +145,10 @@
            workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
         }
         if (StringUtils.isNotBlank(list.get(6).toString())) {
            workExperience.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
            workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
         }
         workExperience.setJobContent(list.get(7).toString());
         this.save(workExperience);
      }
   }
}
}