From d99696c984a05334de8a8b3342efcd89bed2cc11 Mon Sep 17 00:00:00 2001 From: V26772074 Date: Thu, 10 Oct 2024 18:18:44 +0800 Subject: [PATCH] update --- .../jnpf/service/impl/ExpertServiceImpl.java | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/jnpf-tendering-biz/src/main/java/jnpf/service/impl/ExpertServiceImpl.java b/jnpf-tendering-biz/src/main/java/jnpf/service/impl/ExpertServiceImpl.java index 87ed1e9..998362a 100644 --- a/jnpf-tendering-biz/src/main/java/jnpf/service/impl/ExpertServiceImpl.java +++ b/jnpf-tendering-biz/src/main/java/jnpf/service/impl/ExpertServiceImpl.java @@ -299,17 +299,31 @@ public class ExpertServiceImpl extends ServiceImpl 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");