bug修复

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

@@ -26,6 +26,7 @@ import com.sundot.airport.system.mapper.BasePositionMapper;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -63,6 +64,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     @Autowired private ILedgerDormFireSafetyService dormFireSafetyService;
     @Autowired private ILedgerTrainingIssueService trainingIssueService;
     @Autowired private IScoreEventService scoreEventService;
+    @Autowired private LedgerCombinedImportServiceImpl self; // 自注入，用于嵌套事务
     @Autowired private SysUserMapper sysUserMapper;
     @Autowired private SysDeptMapper sysDeptMapper;
     @Autowired private SysPostMapper sysPostMapper;
@@ -101,14 +103,14 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     // ════════════════════════════════════════════════════════════════
     //  入口
     // ════════════════════════════════════════════════════════════════
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, String> importAll(MultipartFile file, String batchNo, String username) throws Exception {
         Map<String, String> result = new LinkedHashMap<>();
+        boolean hasError = false;
         try (Workbook wb = WorkbookFactory.create(file.getInputStream())) {
-            // 构建导入缓存
             buildImportCache();
-            
+
             for (Map.Entry<String, String> entry : SHEET_ROUTE.entrySet()) {
                 String sheetName = entry.getKey();
                 String handler   = entry.getValue();
@@ -118,19 +120,28 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     continue;
                 }
                 try {
-                    int count = dispatch(sheet, handler, batchNo, username);
-                    result.put(sheetName, "导入 " + count + " 条");
+                    int count = self.dispatchInNestedTransaction(sheet, handler, batchNo, username);
+                    result.put(sheetName, "导入成功 " + count + " 条");
                 } catch (Exception e) {
-                    result.put(sheetName, "错误: " + e.getMessage());
+                    result.put(sheetName, "导入失败: " + e.getMessage());
+                    hasError = true;
                 }
             }
         } finally {
-            // 导入完成后释放缓存
             clearImportCache();
         }
+        if (hasError) {
+            throw new RuntimeException("导入失败，所有数据已回滚。详情: " + result);
+        }
         return result;
     }
 
+
+    @Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
+    public int dispatchInNestedTransaction(Sheet sheet, String handler, String batchNo, String username) {
+        return dispatch(sheet, handler, batchNo, username);
+    }
+
     private int dispatch(Sheet sheet, String handler, String batchNo, String username) {
         switch (handler) {
             case "supervisionProblem":    return doSupervisionProblem(sheet, batchNo, username);