From bf5b01b14dc7bfc214e646425a62f5593890d7e3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 08 十一月 2025 22:05:37 +0800
Subject: [PATCH] 清洗数据库日期错误,并且导入日期通用化处理

---
 src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
index 15b99ea..6339b3b 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
@@ -14,16 +14,10 @@
 import com.example.server.progressTrack.model.DjJdgzTrackRecord;
 import com.example.server.teamGroup.service.SysTeamGroupClassService;
 import com.example.server.user.service.UserService;
-import com.example.server.utils.FileUtils;
-import com.example.server.utils.ImportUtil;
-import com.example.server.utils.TreeFieldUtils;
-import com.example.server.utils.UUIDUtil;
+import com.example.server.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -360,7 +354,8 @@
                 String trackLocationStr = ImportUtil.getCellValue(row, 5, pattern);
                 String currentStatusStr = ImportUtil.getCellValue(row, 6, pattern);
                 String hasDelayRiskStr = ImportUtil.getCellValue(row, 7, pattern);
-                String estimatedCompletionTimeStr = ImportUtil.getCellValue(row, 8, pattern);
+                Cell estimatedCompletionTimeStr = row.getCell(8);
+                //String estimatedCompletionTimeStr = ImportUtil.getCellValue(row, 8, pattern);
                 String problemStr = ImportUtil.getCellValue(row, 9, pattern);
                 String followupPlanStr = ImportUtil.getCellValue(row, 10, pattern);
                 String remarkStr = ImportUtil.getCellValue(row, 11, pattern);
@@ -441,17 +436,20 @@
                     data.setHasDelayRisk(hasDelayRiskMap.get(hasDelayRiskStr));
                 }
 
-                if (StringUtils.isNotBlank(estimatedCompletionTimeStr)) {
-                    if (estimatedCompletionTimeStr.matches("[0-9/]+")) {
-                        estimatedCompletionTimeStr = estimatedCompletionTimeStr.replace("/", "-");
-                        data.setEstimatedCompletionTime(estimatedCompletionTimeStr);
-                    } else if (estimatedCompletionTimeStr.matches("[0-9.]+")) {
-                        estimatedCompletionTimeStr = estimatedCompletionTimeStr.replace(".", "-");
-                        data.setEstimatedCompletionTime(estimatedCompletionTimeStr);
-                    } else if (estimatedCompletionTimeStr.matches("[0-9-]+")) {
-                        data.setEstimatedCompletionTime(estimatedCompletionTimeStr);
-                    } else {
-                        result = "绗�" + j + "琛�" + "绗�" + 1 + "涓�" + "棰勮瀹屾垚鏃堕棿鏃ユ湡鏍煎紡涓嶈鑼�";
+                if (estimatedCompletionTimeStr != null) {
+                    try {
+                        String date = ImportUtil.getDateStrFromCell(estimatedCompletionTimeStr);
+
+                        if (date == null) {
+                            result = "绗�" + j + "琛�" + "棰勮瀹屾垚鏃堕棿涓嶈兘涓虹┖";
+                            ImportUtil.updateErrMap(errMap, "棰勮瀹屾垚鏃堕棿涓嶈兘涓虹┖", sheetName, row1);
+                            isErr = true;
+                        } else {
+                            data.setEstimatedCompletionTime(date);
+                        }
+                    } catch (ExcelImportException e) {
+                        result = "绗�" + j + "琛�" + "绗�" + 1 + "涓�" + "棰勮瀹屾垚鏃堕棿鏃ユ湡鏍煎紡涓嶆纭�";
+                        ImportUtil.updateErrMap(errMap, "棰勮瀹屾垚鏃堕棿鏃ユ湡鏍煎紡涓嶆纭�", sheetName, row1);
                         isErr = true;
                     }
                 }

--
Gitblit v1.9.1