首页查询修复bug

孔祥富

2021-02-28 50c9692f448343777dd0dcd4fee00fe2baf7dec0

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

@@ -7,6 +7,7 @@
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import cn.hutool.core.date.DateUtil;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -57,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);
@@ -125,4 +126,26 @@
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empWorkexperienceMapper.momentToNormal(list, operatorId)>0;
    }

    @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpWorkExperience(List<List<Object>> listObject) {
      for (List<Object> list : listObject) {
         EmpWorkExperience workExperience = new EmpWorkExperience();
         workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         workExperience.setEmpNumb(list.get(0).toString());
         workExperience.setEmpName(list.get(1).toString());
         workExperience.setCertificateNumb(list.get(2).toString());
         workExperience.setSex("男".equals(list.get(3).toString()) ? "1" : "2");
         workExperience.setWorkUnit(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
         }
         if (StringUtils.isNotBlank(list.get(6).toString())) {
            workExperience.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
         }
         workExperience.setJobContent(list.get(7).toString());
         this.save(workExperience);
      }
   }
}