From e301d5c4e6de0aca423c54481d100e6ca2886b01 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 08 十一月 2025 22:57:12 +0800
Subject: [PATCH] 清洗数据库日期错误，并且导入日期通用化处理
---
src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 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 90d2886..e01c126 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;
@@ -82,11 +76,16 @@
return list;
}
- /**
- * 鍒犻櫎
- *
- * @param ids
- */
+ public List<DjJdgzTrackRecord> getAll() {
+ List<DjJdgzTrackRecord> list = baseDao.getAll();
+ return list;
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
public void delete(Long[] ids) {
super.deleteLogic(ids);
}
@@ -360,7 +359,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 +441,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;
}
}
@@ -544,4 +547,8 @@
public List<DjJdgzTrackRecord> getName(Long level3NetworkId) {
return baseDao.getName(level3NetworkId);
}
+
+ public List<DjJdgzTrackRecord> getRecordById(Long id) {
+ return baseDao.getRecordById(id);
+ }
}
--
Gitblit v1.9.1