cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign

dev
luotaiqian 2026-08-06 16:58:46 +08:00
parent daab31b998
commit 25a5d58847
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java
View File

@ -527,6 +527,7 @@ public class OrgPersonnelExcelImporter {
if (gender == null) { if (gender == null) {
errors.add(new OrgPersonnelImportErrorCO(row.getRowIndex(), entity.getAccount(), entity.getUserName(), errors.add(new OrgPersonnelImportErrorCO(row.getRowIndex(), entity.getAccount(), entity.getUserName(),
"性别[" + genderText + "]无法识别，跳过该行")); "性别[" + genderText + "]无法识别，跳过该行"));
row.setValidateFail(true);
return null; return null;
} }
entity.setGenderCode(gender.getCode()); entity.setGenderCode(gender.getCode());
@ -540,6 +541,7 @@ public class OrgPersonnelExcelImporter {
if (register == null) { if (register == null) {
errors.add(new OrgPersonnelImportErrorCO(row.getRowIndex(), entity.getAccount(), entity.getUserName(), errors.add(new OrgPersonnelImportErrorCO(row.getRowIndex(), entity.getAccount(), entity.getUserName(),
"是否注册安全工程师[" + registerText + "]无法识别，跳过该行")); "是否注册安全工程师[" + registerText + "]无法识别，跳过该行"));
row.setValidateFail(true);
return null; return null;
} }
entity.setRegisterEngineerFlag(register.getCode()); entity.setRegisterEngineerFlag(register.getCode());
@ -547,17 +549,7 @@ public class OrgPersonnelExcelImporter {
// 学历：兜底字典映射，匹配不到则原样存名称 // 学历：兜底字典映射，匹配不到则原样存名称
String educationText = trim(row.getEducation()); String educationText = trim(row.getEducation());
if (StringUtils.hasText(educationText)) {
ImportEducationEnum education = ImportEducationEnum.match(educationText);
if (education != null) {
entity.setEducationCode(education.getEducationCode());
entity.setEducationName(education.getEducationName());
entity.setEducationLevelCode(education.getEducationLevelCode());
entity.setEducationLevelName(education.getEducationLevelName());
} else {
entity.setEducationName(educationText); entity.setEducationName(educationText);
}
}
// 职称：无字典，按分隔符拆分后原样存入（保留信息，待后续字典完善） // 职称：无字典，按分隔符拆分后原样存入（保留信息，待后续字典完善）
entity.setTitleCodeArr(parseTitles(trim(row.getTitle()))); entity.setTitleCodeArr(parseTitles(trim(row.getTitle())));