From c5d24afdb45ee41138c4e99b5cbfe584373c3a96 Mon Sep 17 00:00:00 2001
From: cst61 <cst612L@126.com>
Date: Mon, 11 May 2026 14:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=87=86=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LbDailyUserTradeServiceImpl.java       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java b/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
index 9a49e69..aec0895 100644
--- a/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
+++ b/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
@@ -222,6 +222,7 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
 
         List<LbDailyUserTrade> importList = new ArrayList<>();
         List<String> skippedRows = new ArrayList<>();
+        int skippedHiddenRows = 0;
         DataFormatter dataFormatter = new DataFormatter();
         log.info("开始导入Excel，fileName={}, size={} bytes, defaultReportDate={}",
                 originalFilename, file.getSize(), defaultReportDate);
@@ -246,6 +247,12 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
                 if (row == null || isEmptyRow(row, dataFormatter)) {
                     continue;
                 }
+                // 隐藏行（行高为 0）在部分导出/复制模板中会与可见行重复存一份数据；
+                // POI 仍会遍历到这些行，若不跳过会导致导入条数约为可见行的整数倍。
+                if (row.getZeroHeight()) {
+                    skippedHiddenRows++;
+                    continue;
+                }
                 try {
                     LbDailyUserTrade trade = parseTradeRow(row, headerIndexMap, dataFormatter, fallbackReportDate, normalizedTenantId);
                     if (trade == null) {
@@ -258,8 +265,8 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
                     skippedRows.add((i + 1) + "(" + ex.getMessage() + ")");
                 }
             }
-            log.info("Excel解析完成，fileName={}, parsedCount={}, skippedCount={}",
-                    originalFilename, importList.size(), skippedRows.size());
+            log.info("Excel解析完成，fileName={}, parsedCount={}, skippedCount={}, skippedHiddenRows={}",
+                    originalFilename, importList.size(), skippedRows.size(), skippedHiddenRows);
             if (importList.isEmpty()) {
                 log.warn("Excel解析后无有效数据，fileName={}, tenantId={}, skippedRows={}",
                         originalFilename, normalizedTenantId, skippedRows);
@@ -285,6 +292,7 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
             result.put("success", false);
             result.put("message", "没有可导入的数据，请检查模板与内容");
             result.put("skippedRows", skippedRows);
+            result.put("skippedHiddenRowCount", skippedHiddenRows);
             return result;
         }
 
@@ -322,13 +330,14 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
             return result;
         }
 
-        log.info("导入成功，fileName={}, importCount={}, skipCount={}",
-                originalFilename, importList.size(), skippedRows.size());
+        log.info("导入成功，fileName={}, importCount={}, skipCount={}, skippedHiddenRows={}",
+                originalFilename, importList.size(), skippedRows.size(), skippedHiddenRows);
         result.put("success", true);
         result.put("message", "导入成功");
         result.put("importCount", importList.size());
         result.put("skipCount", skippedRows.size());
         result.put("skippedRows", skippedRows);
+        result.put("skippedHiddenRowCount", skippedHiddenRows);
         return result;
         } finally {
             if (previousTenantId != null) {