From 580f358ce4e50816211d69ff6e31817b6593d731 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 十月 2024 17:32:50 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
index a40ee8c..dbe3da2 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
@@ -6,10 +6,7 @@
import com.smartor.mapper.PatArchiveImportMapper;
import com.smartor.service.IPatArchiveImportService;
import org.apache.commons.lang3.ObjectUtils;
-import org.apache.poi.ss.usermodel.Cell;
-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;
@@ -21,6 +18,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.regex.Pattern;
/**
* Excel瀵煎叆鎮ｈ�呮。妗圫ervice涓氬姟灞傚鐞�
@@ -123,11 +121,28 @@
//鍒ゆ柇鏁版嵁鏄惁鏈夐棶棰�
- if (ObjectUtils.isNotEmpty(row.getCell(0).toString())) {
+ if (ObjectUtils.isNotEmpty(row.getCell(0))) {
patArchiveImport.setName(row.getCell(0).toString());
+ } else {
+ continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1))) {
- patArchiveImport.setIdcardno(row.getCell(1).toString());
+ Cell cell = row.getCell(1);
+ if (row.getCell(1).toString().contains("X") || row.getCell(1).toString().contains("x")) {
+ patArchiveImport.setIdcardno(row.getCell(1).toString());
+ } else {
+ Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+ boolean matches = pattern.matcher(row.getCell(1).toString()).matches();
+ if (matches) {
+ patArchiveImport.setIdcardno(row.getCell(1).toString());
+ } else {
+ double numericCellValue = cell.getNumericCellValue();
+ DecimalFormat decimalFormat = new DecimalFormat("#");
+ String formattedValue = decimalFormat.format(numericCellValue);
+ patArchiveImport.setIdcardno(formattedValue);
+ }
+ }
+
boolean contains = qc.contains(row.getCell(1).toString());
if (contains) continue;
}
--
Gitblit v1.9.3