|
|
|
|
@ -299,17 +299,31 @@ public class ExpertServiceImpl extends ServiceImpl<ExpertMapper, Expert> impleme
@@ -299,17 +299,31 @@ public class ExpertServiceImpl extends ServiceImpl<ExpertMapper, Expert> impleme
|
|
|
|
|
} |
|
|
|
|
first.ifPresent(dictionaryDataEntity -> addParam.setExpertGroup(dictionaryDataEntity.getId())); |
|
|
|
|
addParam.setPhoneNumber(row.getCell(2).getStringCellValue()); |
|
|
|
|
String birthday = row.getCell(3).getStringCellValue(); |
|
|
|
|
if (StrUtil.isNotBlank(birthday)){ |
|
|
|
|
addParam.setBirthday(LocalDateTimeUtil.format(LocalDateTimeUtil.parse(birthday,"yyyyMMdd"),"yyyy-MM-dd")); |
|
|
|
|
if (null!=row.getCell(3)) { |
|
|
|
|
String birthday = row.getCell(3).getStringCellValue(); |
|
|
|
|
if (StrUtil.isNotBlank(birthday)) { |
|
|
|
|
addParam.setBirthday(LocalDateTimeUtil.format(LocalDateTimeUtil.parse(birthday, "yyyyMMdd"), "yyyy-MM-dd")); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (null!=row.getCell(4)) { |
|
|
|
|
addParam.setExpertSources(row.getCell(4).getStringCellValue()); |
|
|
|
|
} |
|
|
|
|
if (null!=row.getCell(5)) { |
|
|
|
|
addParam.setWorkUnit(row.getCell(5).getStringCellValue()); |
|
|
|
|
} |
|
|
|
|
if (null!=row.getCell(6)) { |
|
|
|
|
addParam.setPost(row.getCell(6).getStringCellValue()); |
|
|
|
|
} |
|
|
|
|
if (null!=row.getCell(7)) { |
|
|
|
|
addParam.setTechnicalPosition(row.getCell(7).getStringCellValue()); |
|
|
|
|
} |
|
|
|
|
if (null!=row.getCell(8)) { |
|
|
|
|
addParam.setProfessionalExpertise(row.getCell(8).getStringCellValue()); |
|
|
|
|
} |
|
|
|
|
if (null!=row.getCell(9)) { |
|
|
|
|
addParam.setSex(StrUtil.equals(row.getCell(9).getStringCellValue(), "男") ? "1" : "2"); |
|
|
|
|
} |
|
|
|
|
addParam.setExpertSources(row.getCell(4).getStringCellValue()); |
|
|
|
|
addParam.setWorkUnit(row.getCell(5).getStringCellValue()); |
|
|
|
|
addParam.setPost(row.getCell(6).getStringCellValue()); |
|
|
|
|
addParam.setTechnicalPosition(row.getCell(7).getStringCellValue()); |
|
|
|
|
addParam.setProfessionalExpertise(row.getCell(8).getStringCellValue()); |
|
|
|
|
addParam.setSex(StrUtil.equals(row.getCell(9).getStringCellValue(),"男")?"1" : "2"); |
|
|
|
|
if (StrUtil.isNotBlank(row.getCell(10).getStringCellValue())){ |
|
|
|
|
if (null!=row.getCell(10)&&StrUtil.isNotBlank(row.getCell(10).getStringCellValue())){ |
|
|
|
|
addParam.setWorkingYears(row.getCell(10).getStringCellValue()); |
|
|
|
|
} |
|
|
|
|
addParam.setStatus("0"); |
|
|
|
|
|