From e598f3c1576c8f608ee3409b0fb9c417b33bea2f Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Thu, 27 Aug 2026 14:24:49 +0800
Subject: [PATCH] archive file
---
.../app/support/OrgPersonnelExcelImporter.java | 9 +++++----
.../safetyeval/app/support/OrgPersonnelImportRow.java | 3 ---
2 files changed, 5 insertions(+), 7 deletions(-)
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 fbdb1933..89a95ccc 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
@@ -704,9 +704,7 @@ public class OrgPersonnelExcelImporter {
// 校验通过 -> 组装职称写入基础信息行
TitleCodeCo titleCode = new TitleCodeCo();
- titleCode.setIndustryCode(String.valueOf(capability.getBdmSeriesMajor().getId()));
titleCode.setTitleCode(levelEnum.getCode());
- titleCode.setIndustryName(capability.getBdmSeriesMajor().getProfessionalName());
basic.getTitleCodeArr().add(titleCode);
return true;
}
@@ -1025,7 +1023,7 @@ public class OrgPersonnelExcelImporter {
* 库中已存在则直接使用库中记录；不存在则自动新增（仅填专业名称）并使用新增记录，同一文件中同名专业仅新增一次。
*
* 回填规则：所学专业 -> basicDisciplineMajorId 与 {@link OrgPersonnelImportRow.CapabilityRow#setBdmMajor}；
- * 系列/专业 -> {@link OrgPersonnelImportRow.CapabilityRow#setBdmSeriesMajor}；字段为空不处理。
+ * 系列/专业 字段为空不处理。
*
*/
private void fillOrCreateMajor(List rows) {
@@ -1075,7 +1073,10 @@ public class OrgPersonnelExcelImporter {
String seriesMajorName = trim(capability.getSeriesMajor());
if (StringUtils.hasText(seriesMajorName)) {
BasicDisciplineMajorE seriesMajor = getOrCreateMajor(seriesMajorName, majorMap);
- capability.setBdmSeriesMajor(basicDisciplineMajorDoConvertor.convertEeToDo(seriesMajor));
+
+ TitleCodeCo titleCode = row.getBasic().getTitleCodeArr().get(0);
+ titleCode.setIndustryCode(String.valueOf(seriesMajor.getId()));
+ titleCode.setIndustryName(seriesMajor.getProfessionalName());
}
}
}
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 b4cd73aa..7e660b62 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
@@ -309,9 +309,6 @@ public class OrgPersonnelImportRow {
@Size(max = 64, message = "评价师证书编号长度不能超过64个字符")
private String seriesMajor;
- @ExcelIgnore
- private BasicDisciplineMajorDO bdmSeriesMajor;
-
@ExcelIgnore
private Integer rowIndex;
}