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

bug fix

dev-tmp1
luotaiqian 2026-08-18 20:09:47 +08:00
parent 5995ab2cbf
commit f7ec3dc7fb
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ public class OrgPersonnelExcelImporter {
/** /**
* 解析 Excel：分别读取 sheet1「专职人员基础信息」与 sheet2「专职人员能力信息」， * 解析 Excel：分别读取 sheet1「专职人员基础信息」与 sheet2「专职人员能力信息」，
* 能力信息按 身份证号（为空时按姓名） 关联到基础信息行； * 能力信息按 身份证号 关联到基础信息行（未匹配或多条均记录异常并剔除该行）；
* 过滤空行并回填物理行号（从1开始，含表头，首条数据为第2行）。 * 过滤空行并回填物理行号（从1开始，含表头，首条数据为第2行）。
* <p> * <p>
* 文件内手机号重复的行在此剔除，并生成提示放入 errors（空账号不参与去重）。 * 文件内手机号重复的行在此剔除，并生成提示放入 errors（空账号不参与去重）。
@ -238,7 +238,7 @@ public class OrgPersonnelExcelImporter {
return new ArrayList<>(); return new ArrayList<>();
} }
Map<String, OrgPersonnelImportRow.CapabilityRow> capabilityMap = indexCapabilityRows(capabilityRaw); Map<String, List<OrgPersonnelImportRow.CapabilityRow>> capabilityMap = indexCapabilityRows(capabilityRaw);
List<OrgPersonnelImportRow> rows = new ArrayList<>(basicRaw.size()); List<OrgPersonnelImportRow> rows = new ArrayList<>(basicRaw.size());
Set<String> seenAccounts = new HashSet<>(); Set<String> seenAccounts = new HashSet<>();
@ -254,7 +254,11 @@ public class OrgPersonnelExcelImporter {
OrgPersonnelImportRow row = new OrgPersonnelImportRow(); OrgPersonnelImportRow row = new OrgPersonnelImportRow();
basic.setRowIndex(i + 2); basic.setRowIndex(i + 2);
row.setBasic(basic); row.setBasic(basic);
row.setCapability(matchCapability(basic, capabilityMap)); row.setCapability(matchCapability(basic, capabilityMap, errors));
// 能力信息未匹配或存在多条，已记录异常，剔除该行
if (row.getCapability() == null) {
continue;
}
// 字段校验：JSR-303 注解（必填、长度、手机号格式）+ 身份证号 // 字段校验：JSR-303 注解（必填、长度、手机号格式）+ 身份证号
if (!validateRowFields(row, errors)) { if (!validateRowFields(row, errors)) {
@ -270,11 +274,11 @@ public class OrgPersonnelExcelImporter {
} }
/** /**
* sheet2 能力信息建立索引：优先身份证号，身份证号为空时按姓名；重复时保留首条并告警。 * sheet2 能力信息建立索引：按身份证号分组。
*/ */
private Map<String, OrgPersonnelImportRow.CapabilityRow> indexCapabilityRows( private Map<String, List<OrgPersonnelImportRow.CapabilityRow>> indexCapabilityRows(
List<OrgPersonnelImportRow.CapabilityRow> capabilityRaw) { List<OrgPersonnelImportRow.CapabilityRow> capabilityRaw) {
Map<String, OrgPersonnelImportRow.CapabilityRow> map = new LinkedHashMap<>(); Map<String, List<OrgPersonnelImportRow.CapabilityRow>> map = new LinkedHashMap<>();
if (capabilityRaw == null || capabilityRaw.isEmpty()) { if (capabilityRaw == null || capabilityRaw.isEmpty()) {
return map; return map;
} }
@ -289,39 +293,30 @@ public class OrgPersonnelExcelImporter {
continue; continue;
} }
capability.setRowIndex(i + 2); capability.setRowIndex(i + 2);
String key = capabilityKey(capability.getIdCardNo(), capability.getUserName()); map.computeIfAbsent(trim(capability.getIdCardNo()), k -> new ArrayList<>()).add(capability);
if (map.putIfAbsent(key, capability) != null) {
LOGGER.warn("人员导入能力信息重复，key={}，sheet2行号={}，仅保留首条", key, capability.getRowIndex());
}
} }
return map; return map;
} }
/** /**
* 基础信息行匹配能力信息：优先身份证号，其次姓名；未匹配返回 null。 * 基础信息行按身份证号匹配能力信息：
* 未匹配到或多条均记录异常并返回 null，仅唯一匹配时返回该行。
*/ */
private OrgPersonnelImportRow.CapabilityRow matchCapability(OrgPersonnelImportRow.BasicRow basic, private OrgPersonnelImportRow.CapabilityRow matchCapability(OrgPersonnelImportRow.BasicRow basic,
Map<String, OrgPersonnelImportRow.CapabilityRow> capabilityMap) { Map<String, List<OrgPersonnelImportRow.CapabilityRow>> capabilityMap,
if (capabilityMap.isEmpty()) { List<OrgPersonnelImportErrorCO> errors) {
List<OrgPersonnelImportRow.CapabilityRow> capabilityList = capabilityMap.get(trim(basic.getIdCardNo()));
if (CollectionUtils.isEmpty(capabilityList)) {
errors.add(new OrgPersonnelImportErrorCO(basic.getRowIndex(), trim(basic.getAccount()), trim(basic.getUserName()),
"没有在专职人员能力信息中查询到数据"));
return null; return null;
} }
OrgPersonnelImportRow.CapabilityRow capability = if (capabilityList.size() > 1) {
capabilityMap.get(capabilityKey(basic.getIdCardNo(), null)); errors.add(new OrgPersonnelImportErrorCO(basic.getRowIndex(), trim(basic.getAccount()), trim(basic.getUserName()),
if (capability != null) { "专职人员能力信息中查询到多条数据"));
return capability; return null;
} }
return capabilityMap.get(capabilityKey(null, basic.getUserName())); return capabilityList.get(0);
}
/**
* 能力信息索引键：身份证号优先（前缀 ID:），为空时使用姓名（前缀 NAME:）。
*/
private String capabilityKey(String idCardNo, String userName) {
String idCard = trim(idCardNo);
if (StringUtils.hasText(idCard)) {
return "ID:" + idCard;
}
return "NAME:" + trim(userName);
} }
/** /**