diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java index abce03d0..40052588 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java @@ -413,7 +413,6 @@ public class OrgPersonnelExcelImporter { } // 学历类型、毕业院校、学历层次、所学专业 回填到基础信息行(@ExcelIgnore 字段,Excel原始值忽略) - row.getBasic().setEducationType(capabilityRow.getEducationType()); row.getBasic().setGraduateSchool(capabilityRow.getGraduateSchool()); row.getBasic().setEducationLevel(capabilityRow.getEducationLevel()); row.getBasic().setMajor(capabilityRow.getMajor()); @@ -1147,8 +1146,6 @@ public class OrgPersonnelExcelImporter { // 学历:名称取学历层次,类型/层次分别填入 entity.setEducationCode(trim(capability.getEducationLevel())); entity.setEducationName(trim(capability.getEducationLevel())); - entity.setEducationTypeName(trim(capability.getEducationType())); - entity.setEducationTypeCode(trim(capability.getEducationType())); entity.setEducationLevelName(trim(capability.getEducationLevel())); entity.setEducationLevelCode(trim(capability.getEducationLevel())); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java index f03190cf..0cf6c2a7 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java @@ -253,21 +253,16 @@ public class OrgPersonnelImportRow { @Size(max = 128, message = "能力认证二-来源最多128个字符") private String cert2Source; - @ExcelProperty(value = "学历类型", index = 8) - @NotBlank(message = "学历类型不能为空") - @Size(max = 64, message = "学历类型最多64个字符") - private String educationType; - - @ExcelProperty(value = "毕业院校", index = 9) + @ExcelProperty(value = "毕业院校", index = 8) @Size(max = 200, message = "毕业院校长度不能超过200个字符") @NotBlank(message = "毕业院校不能为空") private String graduateSchool; - @ExcelProperty(value = "学历层次", index = 10) + @ExcelProperty(value = "学历层次", index = 9) @NotBlank(message = "学历层次不能为空") private String educationLevel; - @ExcelProperty(value = "所学专业", index = 11) + @ExcelProperty(value = "所学专业", index = 10) @Size(max = 100, message = "所学专业长度不能超过100个字符") @NotBlank(message = "所学专业不能为空") private String major; @@ -275,45 +270,45 @@ public class OrgPersonnelImportRow { @ExcelIgnore private BasicDisciplineMajorDO bdmMajor; - @ExcelProperty(value = "是否注册安全工程师", index = 12) + @ExcelProperty(value = "是否注册安全工程师", index = 11) @Pattern(regexp = "^([是否])?$", message = "是否注册安全工程师仅允许:是、否") @NotBlank(message = "是否注册安全工程师不能为空") private String registerEngineer; - @ExcelProperty(value = "注安专业类别", index = 13) + @ExcelProperty(value = "注安专业类别", index = 12) @Size(max = 100, message = "注安专业类别长度不能超过100个字符") private String registerEngineerCategory; - @ExcelProperty(value = "注安等级", index = 14) + @ExcelProperty(value = "注安等级", index = 13) @Size(max = 100, message = "注安等级长度不能超过100个字符") private String registerEngineerLevel; - @ExcelProperty(value = "注安证书编号", index = 15) + @ExcelProperty(value = "注安证书编号", index = 14) @Size(max = 64, message = "注安证书编号长度不能超过100个字符") private String registerEngineerCertNo; - @ExcelProperty(value = "执业证书编号", index = 16) + @ExcelProperty(value = "执业证书编号", index = 15) @Size(max = 64, message = "执业证书编号长度不能超过100个字符") private String practiceCertNo; - @ExcelProperty(value = "是否评价师", index = 17) + @ExcelProperty(value = "是否评价师", index = 16) @Pattern(regexp = "^([是否])?$", message = "是否评价师仅允许:是、否") @NotBlank(message = "是否是否评价师不能为空") private String evaluator; - @ExcelProperty(value = "评价师等级", index = 18) + @ExcelProperty(value = "评价师等级", index = 17) @Size(max = 64, message = "评价师等级长度不能超过100个字符") private String evaluatorLevel; - @ExcelProperty(value = "评价师证书编号", index = 19) + @ExcelProperty(value = "评价师证书编号", index = 18) @Size(max = 64, message = "评价师证书编号长度不能超过64个字符") private String evaluatorCertNo; - @ExcelProperty(value = "职称", index = 20) + @ExcelProperty(value = "职称", index = 19) @Size(max = 64, message = "评价师证书编号长度不能超过64个字符") private String seniorEngineer; - @ExcelProperty(value = "系列/专业", index = 21) + @ExcelProperty(value = "系列/专业", index = 20) @Size(max = 64, message = "评价师证书编号长度不能超过64个字符") private String seriesMajor;