From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费

---
 service-api/src/main/java/com/java110/api/importData/adapt/ImportReportMainDataV2CleaningAdapt.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportReportMainDataV2CleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportReportMainDataV2CleaningAdapt.java
index 7671866..13efe8b 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportReportMainDataV2CleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportReportMainDataV2CleaningAdapt.java
@@ -4,6 +4,7 @@
 import com.java110.api.importData.DefaultImportDataAdapt;
 import com.java110.api.importData.IImportDataCleaningAdapt;
 import com.java110.dto.importData.ImportOwnerRoomDto;
+import com.java110.dto.importData.Vtil;
 import com.java110.dto.system.ComponentValidateResult;
 import com.java110.utils.util.ImportExcelUtils;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -40,15 +41,23 @@
      */
     private void getOwnerRooms(Workbook workbook, List<Object[]> ownerRoomDtos, ComponentValidateResult result) throws ParseException {
         Sheet sheet = null;
-        sheet = ImportExcelUtils.getSheet(workbook, "鑽i『鑻戠鎶ュ崟");
+        String sheetName = "鑽i『鑻戠鎶ュ崟";
+        sheet = ImportExcelUtils.getSheet(workbook, sheetName);
         List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
         ImportOwnerRoomDto importOwnerRoomDto = null;
         for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
-            if (osIndex < 5) {
+            if (osIndex < 2) {
                 continue;
             }
             Object[] os = oList.get(osIndex);
 
+            try {
+                if (Vtil.defaultValue(os[2]) == null) {
+                    continue;
+                }
+            }catch (Exception e){
+                continue;
+            }
             ownerRoomDtos.add(os);
 
         }

--
Gitblit v1.8.0