孔祥富
2021-04-01 63c7e9d7051ed6742eb7334346a53376b0247c29
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -80,7 +80,7 @@
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
        return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
    }
@@ -167,7 +167,7 @@
   @Transactional(rollbackFor = Exception.class)
   public void importEmpWorkExperience(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
            EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
@@ -185,7 +185,7 @@
         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.setSex(list.get(3).toString());
         workExperience.setWorkUnit(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
@@ -196,7 +196,7 @@
         workExperience.setJobContent(list.get(7).toString());
         workExperience.setCreator(FebsUtil.getUserId());
         workExperience.setModifier(FebsUtil.getUserId());
         workExperience.setDelFlag(2);
         workExperience.setDelFlag(0);
         this.save(workExperience);
      }
   }