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

archive file

dev-tmp1
luotaiqian 2026-08-27 14:24:49 +08:00
parent 9212d5c224
commit e598f3c157
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,9 +704,7 @@ public class OrgPersonnelExcelImporter {
// 校验通过 -> 组装职称写入基础信息行 // 校验通过 -> 组装职称写入基础信息行
TitleCodeCo titleCode = new TitleCodeCo(); TitleCodeCo titleCode = new TitleCodeCo();
titleCode.setIndustryCode(String.valueOf(capability.getBdmSeriesMajor().getId()));
titleCode.setTitleCode(levelEnum.getCode()); titleCode.setTitleCode(levelEnum.getCode());
titleCode.setIndustryName(capability.getBdmSeriesMajor().getProfessionalName());
basic.getTitleCodeArr().add(titleCode); basic.getTitleCodeArr().add(titleCode);
return true; return true;
} }
@ -1025,7 +1023,7 @@ public class OrgPersonnelExcelImporter {
* 库中已存在则直接使用库中记录；不存在则自动新增（仅填专业名称）并使用新增记录，同一文件中同名专业仅新增一次。 * 库中已存在则直接使用库中记录；不存在则自动新增（仅填专业名称）并使用新增记录，同一文件中同名专业仅新增一次。
* <p> * <p>
* 回填规则：所学专业 -> basicDisciplineMajorId 与 {@link OrgPersonnelImportRow.CapabilityRow#setBdmMajor}； * 回填规则：所学专业 -> basicDisciplineMajorId 与 {@link OrgPersonnelImportRow.CapabilityRow#setBdmMajor}；
* 系列/专业 -> {@link OrgPersonnelImportRow.CapabilityRow#setBdmSeriesMajor}；字段为空不处理。 * 系列/专业 字段为空不处理。
* </p> * </p>
*/ */
private void fillOrCreateMajor(List<OrgPersonnelImportRow> rows) { private void fillOrCreateMajor(List<OrgPersonnelImportRow> rows) {
@ -1075,7 +1073,10 @@ public class OrgPersonnelExcelImporter {
String seriesMajorName = trim(capability.getSeriesMajor()); String seriesMajorName = trim(capability.getSeriesMajor());
if (StringUtils.hasText(seriesMajorName)) { if (StringUtils.hasText(seriesMajorName)) {
BasicDisciplineMajorE seriesMajor = getOrCreateMajor(seriesMajorName, majorMap); 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());
} }
} }
} }

3
safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java
View File

@ -309,9 +309,6 @@ public class OrgPersonnelImportRow {
@Size(max = 64, message = "评价师证书编号长度不能超过64个字符") @Size(max = 64, message = "评价师证书编号长度不能超过64个字符")
private String seriesMajor; private String seriesMajor;
@ExcelIgnore
private BasicDisciplineMajorDO bdmSeriesMajor;
@ExcelIgnore @ExcelIgnore
private Integer rowIndex; private Integer rowIndex;
} }