From 723d38375c45d24737bfef6f33a9686254abf99b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 17 十月 2024 13:42:27 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 c5ea8c6..a40ee8c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveImportServiceImpl.java
@@ -6,6 +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;
@@ -15,6 +16,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -103,11 +105,14 @@
     public List<PatArchiveImport> importPatInfo(MultipartFile multipartFile) {
         //鐢ㄤ簬杩斿洖
         List<PatArchiveImport> patArchiveImports = new ArrayList<>();
+
+        //鍘婚噸
+        List<String> qc = new ArrayList<>();
         try {
             Workbook workbook = new XSSFWorkbook(multipartFile.getInputStream());
             Sheet sheet = workbook.getSheetAt(0);
 
-            for (int i = sheet.getFirstRowNum() + 1; i < sheet.getLastRowNum(); i++) {
+            for (int i = sheet.getFirstRowNum() + 1; i <= sheet.getLastRowNum(); i++) {
                 //瀵煎叆鎮h�呭璞�
                 PatArchiveImport patArchiveImport = new PatArchiveImport();
                 Row row = sheet.getRow(i);
@@ -123,10 +128,16 @@
                 }
                 if (ObjectUtils.isNotEmpty(row.getCell(1))) {
                     patArchiveImport.setIdcardno(row.getCell(1).toString());
+                    boolean contains = qc.contains(row.getCell(1).toString());
+                    if (contains) continue;
                 }
 
                 if (ObjectUtils.isNotEmpty(row.getCell(2))) {
-                    patArchiveImport.setTelcode(row.getCell(2).toString());
+                    Cell cell = row.getCell(2);
+                    double numericCellValue = cell.getNumericCellValue();
+                    DecimalFormat decimalFormat = new DecimalFormat("#");
+                    String formattedValue = decimalFormat.format(numericCellValue);
+                    patArchiveImport.setTelcode(formattedValue);
                 }
                 if (ObjectUtils.isNotEmpty(row.getCell(3))) {
                     patArchiveImport.setBatchName(row.getCell(3).toString());
@@ -145,13 +156,13 @@
                     patArchiveImport.setAge(Long.valueOf(row.getCell(7).toString()));
                 }
 
-                patArchiveImports.add(patArchiveImport);
-
                 patArchiveImport.setCreateTime(new Date());
                 patArchiveImport.setUpdateTime(new Date());
                 //鎵归噺鍙凤紙褰撳墠鏃堕棿锛�
                 patArchiveImport.setBatchNo(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
                 insertPatArchiveImport(patArchiveImport);
+
+                patArchiveImports.add(patArchiveImport);
             }
 
         } catch (Exception e) {

--
Gitblit v1.9.3