台账用户名称多个拆分

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerImportController.java

@@ -83,7 +83,12 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
-        // 批量预加载组织信息
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerSupervisionProblem::getInspectedName,
+                LedgerSupervisionProblem::setInspectedName);
+        
+        // 批量预加载组织信息（性能优化）
         orgInfoHelper.batchFillOrgAndLocationInfo(list,
                 LedgerSupervisionProblem::getInspectedName,
                 LedgerSupervisionProblem::getPosition,
@@ -162,6 +167,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerRealtimeInterception::getInspectorName,
+                LedgerRealtimeInterception::setInspectorName);
+        
         // 批量预加载组织信息和岗位/区域/通道
         orgInfoHelper.batchFillOrgAndLocationInfo(
                 list,
@@ -217,6 +227,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果被检查人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerServicePatrol::getInspectedName,
+                LedgerServicePatrol::setInspectedName);
+        
         // 批量预加载组织信息和岗位/区域/通道
         orgInfoHelper.batchFillOrgAndLocationInfo(
                 list,
@@ -272,6 +287,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerComplaint::getResponsibleName,
+                LedgerComplaint::setResponsibleName);
+        
         // 批量预加载组织信息（性能优化）
         orgInfoHelper.batchFillOrgInfo(list, LedgerComplaint::getResponsibleName);
 
@@ -297,6 +317,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果被测试人员字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerSecurityTest::getTestedName,
+                LedgerSecurityTest::setTestedName);
+        
         // 批量预加载组织信息和岗位/区域/通道
         orgInfoHelper.batchFillOrgAndLocationInfo(
                 list,
@@ -383,6 +408,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerUnsafeEvent::getResponsibleName,
+                LedgerUnsafeEvent::setResponsibleName);
+        
         // 批量预加载组织信息和岗位/区域/通道
         orgInfoHelper.batchFillOrgAndLocationInfo(
                 list,
@@ -437,6 +467,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果检查人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerSeizureStats::getInspectorName,
+                LedgerSeizureStats::setInspectorName);
+        
         // 批量预加载组织信息和岗位/区域/通道
         orgInfoHelper.batchFillOrgAndLocationInfo(
                 list,
@@ -504,6 +539,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果人员姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerTerminalBonus::getPersonName,
+                LedgerTerminalBonus::setPersonName);
+        
         // 批量预加载组织信息
         orgInfoHelper.batchFillOrgInfo(list, LedgerTerminalBonus::getPersonName);
 
@@ -553,6 +593,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果人员姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerExamScore::getPersonName,
+                LedgerExamScore::setPersonName);
+        
         // 批量预加载组织信息
         orgInfoHelper.batchFillOrgInfo(list, LedgerExamScore::getPersonName);
 
@@ -579,6 +624,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果人员姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerRewardApproval::getPersonName,
+                LedgerRewardApproval::setPersonName);
+        
         // 批量预加载组织信息
         orgInfoHelper.batchFillOrgInfo(list, LedgerRewardApproval::getPersonName);
 
@@ -778,6 +828,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果人员姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerLeaveSpecial::getPersonName,
+                LedgerLeaveSpecial::setPersonName);
+        
         // 批量预加载组织信息
         orgInfoHelper.batchFillOrgInfo(list, LedgerLeaveSpecial::getPersonName);
 
@@ -855,6 +910,11 @@ public class LedgerImportController extends BaseController {
         if (list == null || list.isEmpty()) {
             return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
         }
+        
+        // 如果人员姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(list, LedgerQualificationLevel::getPersonName,
+                LedgerQualificationLevel::setPersonName);
+        
         // 批量预加载组织信息（性能优化）
         orgInfoHelper.batchFillOrgInfo(list, LedgerQualificationLevel::getPersonName);
 
@@ -920,4 +980,68 @@ public class LedgerImportController extends BaseController {
     }
 
 
+    /**
+     * 根据名称字段拆分数据行
+     * 如果名称字段包含多个人员（用逗号、顿号、分号等分隔），则将一条数据拆分成多条
+     */
+    private <T> List<T> splitRowsByMultiName(
+            List<T> sourceList,
+            java.util.function.Function<T, String> nameGetter,
+            java.util.function.BiConsumer<T, String> nameSetter) {
+
+        List<T> result = new ArrayList<>();
+
+        for (T source : sourceList) {
+            String nameField = nameGetter.apply(source);
+            List<String> names = splitNames(nameField);
+
+            if (names.size() == 1) {
+                // 只有一个名称，直接添加
+                result.add(source);
+            } else {
+                // 多个名称，拆分成多条记录
+                for (String name : names) {
+                    try {
+                        T copy = (T) source.getClass().getDeclaredConstructor().newInstance();
+                        org.springframework.beans.BeanUtils.copyProperties(source, copy);
+                        nameSetter.accept(copy, name);
+                        result.add(copy);
+                    } catch (Exception e) {
+                        // 如果复制失败，使用原始对象
+                        result.add(source);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 拆分名称字段
+     */
+    private List<String> splitNames(String nameField) {
+        if (nameField == null || nameField.trim().isEmpty()) {
+            return java.util.Collections.singletonList(nameField);
+        }
+
+        String trimmed = nameField.trim();
+
+        // 支持的分隔符：中文逗号、英文逗号、中文顿号、中文分号、英文分号、竖线
+        String[] names = trimmed.split("[,，、;；|]");
+
+        List<String> result = new ArrayList<>();
+        for (String name : names) {
+            String trimmedName = name.trim();
+            if (!trimmedName.isEmpty()) {
+                result.add(trimmedName);
+            }
+        }
+
+        // 如果没有拆分出任何名称，返回原始值
+        return result.isEmpty() ? java.util.Collections.singletonList(trimmed) : result;
+    }
+
+
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerCombinedImportServiceImpl.java

@@ -218,20 +218,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRectificationEvidence(str(c, 12)); // 整改佐证材料
             o.setInspectorName(str(c, 13));    // 巡查人员
 
-            // 根据责任人名称查找组织ID和名称
-            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
-                if (!orgInfo.isEmpty()) {
-                    o.setInspectedId((Long) orgInfo.get("userId"));
-                    o.setDeptId((Long) orgInfo.get("deptId"));
-                    o.setDeptName((String) orgInfo.get("deptName"));
-                    o.setTeamId((Long) orgInfo.get("teamId"));
-                    o.setTeamName((String) orgInfo.get("teamName"));
-                    o.setGroupId((Long) orgInfo.get("groupId"));
-                    o.setGroupName((String) orgInfo.get("groupName"));
-                }
-            }
-
             // 根据岗位和区域查找对应ID
             if (importCache != null) {
                 String positionName = o.getPosition();
@@ -263,6 +249,31 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerSupervisionProblem::getInspectedName,
+            LedgerSupervisionProblem::setInspectedName,
+            obj -> copyObject(obj, LedgerSupervisionProblem.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerSupervisionProblem o : list) {
+            String inspectedName = o.getInspectedName();
+            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectedId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+        }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerSupervisionProblem> existList = supervisionProblemService.selectSupervisionProblemList(new LedgerSupervisionProblem());
             List<String> repeatList = new ArrayList<>();
@@ -393,20 +404,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setEvidenceFile(str(c, 8));         // 附件
             o.setCheckPersonnel(str(c, 9));       // 检查人员
 
-            // 根据责任人名称查找组织ID和名称
-            if (inspectorName != null && !inspectorName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
-                if (!orgInfo.isEmpty()) {
-                    o.setInspectorId((Long) orgInfo.get("userId"));
-                    o.setDeptId((Long) orgInfo.get("deptId"));
-                    o.setDeptName((String) orgInfo.get("deptName"));
-                    o.setTeamId((Long) orgInfo.get("teamId"));
-                    o.setTeamName((String) orgInfo.get("teamName"));
-                    o.setGroupId((Long) orgInfo.get("groupId"));
-                    o.setGroupName((String) orgInfo.get("groupName"));
-                }
-            }
-
             // 根据岗位和区域查找对应ID
             if (importCache != null) {
                 String positionName = str(c, 3);  // 岗位
@@ -440,6 +437,31 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerRealtimeInterception::getInspectorName,
+            LedgerRealtimeInterception::setInspectorName,
+            obj -> copyObject(obj, LedgerRealtimeInterception.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerRealtimeInterception o : list) {
+            String inspectorName = o.getInspectorName();
+            if (inspectorName != null && !inspectorName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectorId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+        }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerRealtimeInterception> existList = realtimeInterceptionService.selectList(new LedgerRealtimeInterception());
             List<String> repeatList = new ArrayList<>();
@@ -494,20 +516,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRectificationStatus(str(c, 10));     // 整改情况
             o.setEvidenceMaterial(str(c, 11));        // 佐证材料
             o.setCheckPersonnel(str(c, 12));          // 检查人员
-
-            // 根据责任人名称查找组织ID和名称
-            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
-                if (!orgInfo.isEmpty()) {
-                    o.setInspectedId((Long) orgInfo.get("userId"));
-                    o.setDeptId((Long) orgInfo.get("deptId"));
-                    o.setDeptName((String) orgInfo.get("deptName"));
-                    o.setTeamId((Long) orgInfo.get("teamId"));
-                    o.setTeamName((String) orgInfo.get("teamName"));
-                    o.setGroupId((Long) orgInfo.get("groupId"));
-                    o.setGroupName((String) orgInfo.get("groupName"));
-                }
-            }
             
             // 根据岗位和区域查找对应ID
             if (importCache != null) {
@@ -542,6 +550,31 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerServicePatrol::getInspectedName,
+            LedgerServicePatrol::setInspectedName,
+            obj -> copyObject(obj, LedgerServicePatrol.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerServicePatrol o : list) {
+            String inspectedName = o.getInspectedName();
+            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectedId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+        }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerServicePatrol> existList = servicePatrolService.selectList(new LedgerServicePatrol());
             List<String> repeatList = new ArrayList<>();
@@ -591,8 +624,24 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setChannelSource(str(c, 7));         // 渠道来源
             o.setIsResponsible(str(c, 8));         // 是否有责
             o.setResultHandling(str(c, 9));        // 处理进度
-
-            // 根据责任人名称查找组织信息和ID
+            
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
+            o.setCreateBy(username);
+            list.add(o);
+        }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerComplaint::getResponsibleName,
+            LedgerComplaint::setResponsibleName,
+            obj -> copyObject(obj, LedgerComplaint.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerComplaint o : list) {
+            String responsibleName = o.getResponsibleName();
             if (responsibleName != null && !responsibleName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
                 if (!orgInfo.isEmpty()) {
@@ -605,11 +654,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-            
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
         }
         complaintService.batchInsert(list);
         return ImportResultDto.builder().importNum(list.size()).build();
@@ -639,20 +683,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setTestLevel(str(c, 10));          // 层级
             o.setResultHandling(str(c, 11));    // 整改措施
             o.setReviewMaterial(str(c, 12));    // 整改材料
-
-            // 使用缓存查找组织信息（根据被测人名称）
-            if (testedName != null && !testedName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(testedName);
-                if (!orgInfo.isEmpty()) {
-                    o.setTestedId((Long) orgInfo.get("userId"));
-                    o.setDeptId((Long) orgInfo.get("deptId"));
-                    o.setDeptName((String) orgInfo.get("deptName"));
-                    o.setTeamId((Long) orgInfo.get("teamId"));
-                    o.setTeamName((String) orgInfo.get("teamName"));
-                    o.setGroupId((Long) orgInfo.get("groupId"));
-                    o.setGroupName((String) orgInfo.get("groupName"));
-                }
-            }
             
             // 根据岗位名称和区域名称查找ID
             if (importCache != null) {
@@ -857,18 +887,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setChannelNo(str(c, 8));
             o.setImage(str(c, 9));
             
-            // 使用缓存查找组织信息和名称
-            Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
-            if (!orgInfo.isEmpty()) {
-                o.setResponsibleId((Long) orgInfo.get("userId"));
-                o.setDeptId((Long) orgInfo.get("deptId"));
-                o.setDeptName((String) orgInfo.get("deptName"));
-                o.setTeamId((Long) orgInfo.get("teamId"));
-                o.setTeamName((String) orgInfo.get("teamName"));
-                o.setGroupId((Long) orgInfo.get("groupId"));
-                o.setGroupName((String) orgInfo.get("groupName"));
-            }
-            
             // 根据岗位名称和区域名称查找ID
             if (importCache != null) {
                 String positionName = str(c, 7);
@@ -903,6 +921,31 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
+        
+        // 如果责任人字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerUnsafeEvent::getResponsibleName,
+            LedgerUnsafeEvent::setResponsibleName,
+            obj -> copyObject(obj, LedgerUnsafeEvent.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerUnsafeEvent o : list) {
+            String responsibleName = o.getResponsibleName();
+            if (responsibleName != null && !responsibleName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
+                if (!orgInfo.isEmpty()) {
+                    o.setResponsibleId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+        }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerUnsafeEvent> existList = unsafeEventService.selectList(new LedgerUnsafeEvent());
             List<String> repeatList = new ArrayList<>();
@@ -982,20 +1025,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setHandlingMethod(str(c, 21));     // 处理结果
             o.setRemark(str(c, 22));             // 备注
 
-            // 使用缓存查找组织信息和名称
-            if (inspectorName != null && !inspectorName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
-                if (!orgInfo.isEmpty()) {
-                    o.setInspectorId((Long) orgInfo.get("userId"));
-                    o.setDeptId((Long) orgInfo.get("deptId"));
-                    o.setDeptName((String) orgInfo.get("deptName"));
-                    o.setTeamId((Long) orgInfo.get("teamId"));
-                    o.setTeamName((String) orgInfo.get("teamName"));
-                    o.setGroupId((Long) orgInfo.get("groupId"));
-                    o.setGroupName((String) orgInfo.get("groupName"));
-                }
-            }
-
             // 根据岗位名称和工作区域名称查找ID
             if (importCache != null) {
                 String positionName = str(c, 6);
@@ -1020,6 +1049,31 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setCreateBy(username);
             list.add(o);
         }
+        
+        // 如果安检员字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerSeizureStats::getInspectorName,
+            LedgerSeizureStats::setInspectorName,
+            obj -> copyObject(obj, LedgerSeizureStats.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerSeizureStats o : list) {
+            String inspectorName = o.getInspectorName();
+            if (inspectorName != null && !inspectorName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectorId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+        }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerSeizureStats> existList = seizureStatsService.selectList(new LedgerSeizureStats());
             List<String> repeatList = new ArrayList<>();
@@ -1067,7 +1121,20 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setSourceType("1");
             o.setCreateBy(username);
             
-            // 根据人员姓名查找组织ID和名称
+            list.add(o);
+        }
+        
+        // 如果姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerTerminalBonus::getPersonName,
+            LedgerTerminalBonus::setPersonName,
+            obj -> copyObject(obj, LedgerTerminalBonus.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerTerminalBonus o : list) {
+            String personName = o.getPersonName();
             if (personName != null && !personName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
                 if (!orgInfo.isEmpty()) {
@@ -1080,8 +1147,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-            
-            list.add(o);
         }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerTerminalBonus> existList = terminalBonusService.selectList(new LedgerTerminalBonus());
@@ -1126,7 +1191,23 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setTheoryScore(decimal(c, 3));
             o.setImageScore(decimal(c, 4));
 
-            // 根据姓名查找组织信息
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
+            o.setCreateBy(username);
+            list.add(o);
+        }
+        
+        // 如果考试人员字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerExamScore::getPersonName,
+            LedgerExamScore::setPersonName,
+            obj -> copyObject(obj, LedgerExamScore.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerExamScore o : list) {
+            String personName = o.getPersonName();
             if (personName != null && !personName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
                 if (!orgInfo.isEmpty()) {
@@ -1139,11 +1220,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
         }
         examScoreService.batchInsert(list);
         return ImportResultDto.builder().importNum(list.size()).build();
@@ -1167,8 +1243,24 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRewardReason(str(c, 5));         // 主要事由简述
             o.setDisposalResult(str(c, 6));       // 处置结果
             o.setProofMaterial(str(c, 7));        // 证明材料
-
-            // 根据姓名查找组织ID和名称
+            
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
+            o.setCreateBy(username);
+            list.add(o);
+        }
+        
+        // 如果姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerRewardApproval::getPersonName,
+            LedgerRewardApproval::setPersonName,
+            obj -> copyObject(obj, LedgerRewardApproval.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerRewardApproval o : list) {
+            String personName = o.getPersonName();
             if (personName != null && !personName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
                 if (!orgInfo.isEmpty()) {
@@ -1179,11 +1271,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setTeamName((String) orgInfo.get("teamName"));
                 }
             }
-            
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
         }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerRewardApproval> existList = rewardApprovalService.selectList(new LedgerRewardApproval());
@@ -1252,7 +1339,23 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setLeaveType(str(c, 3));
             o.setDays(hoursOrDays(c, 4));
 
-            // 根据姓名查找组织信息
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
+            o.setCreateBy(username);
+            list.add(o);
+        }
+        
+        // 如果姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerLeaveSpecial::getPersonName,
+            LedgerLeaveSpecial::setPersonName,
+            obj -> copyObject(obj, LedgerLeaveSpecial.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerLeaveSpecial o : list) {
+            String personName = o.getPersonName();
             if (personName != null && !personName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
                 if (!orgInfo.isEmpty()) {
@@ -1265,11 +1368,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
         }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerLeaveSpecial> existList = leaveSpecialService.selectList(new LedgerLeaveSpecial());
@@ -1993,7 +2091,23 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setLevelFourTime(date(c, 4));     // 四级发证时间
             o.setLevelFiveTime(date(c, 5));     // 五级发证时间
 
-            // 根据姓名查找组织ID和名称
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
+            o.setCreateBy(username);
+            list.add(o);
+        }
+        
+        // 如果姓名字段包含多个名称，拆分成多条记录
+        list = splitRowsByMultiName(
+            list,
+            LedgerQualificationLevel::getPersonName,
+            LedgerQualificationLevel::setPersonName,
+            obj -> copyObject(obj, LedgerQualificationLevel.class)
+        );
+        
+        // 重新为拆分后的记录填充组织信息和ID
+        for (LedgerQualificationLevel o : list) {
+            String personName = o.getPersonName();
             if (personName != null && !personName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
                 if (!orgInfo.isEmpty()) {
@@ -2006,11 +2120,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
         }
         if (CollUtil.isNotEmpty(list)) {
             List<LedgerQualificationLevel> existList = qualificationLevelService.selectQueryList(new LedgerQualificationLevel());