From 53577ae0fcba9342b22ad1758303aa61409160d1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 19:10:58 +0800
Subject: [PATCH] art: 设备保养标准导入问题修改
---
src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index a43dc02..a9025c6 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -44,10 +44,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -311,13 +308,8 @@
ImportParams params = new ImportParams();
params.setTitleRows(2); // 璺宠繃鍓�2琛屾爣棰�
- params.setHeadRows(1); // 绗�3琛屾槸琛ㄥご
+ params.setHeadRows(2); // 绗�3琛屾槸琛ㄥご
params.setSheetNum(1); // 璇诲彇绗竴涓伐浣滆〃
-
- int dataEndRow = findDataEndRow(file.getInputStream());
- log.info("璁＄畻鍑虹殑鏁版嵁缁撴潫琛�: {}", dataEndRow);
-
- params.setLastOfInvalidRow(dataEndRow);
params.setNeedSave(true);
EamMaintenanceStandardRequest standardRequest = new EamMaintenanceStandardRequest();
@@ -342,22 +334,17 @@
List<MaintenanceStandardImport> list = ExcelImportUtil.importExcel(file.getInputStream(), MaintenanceStandardImport.class, params);
log.info("瀹為檯璇诲彇鍒扮殑鏄庣粏鏁伴噺: {}", list.size());
-
- // 鎵撳嵃鍓嶅嚑鏉¤褰曠敤浜庤皟璇�
- if (!list.isEmpty()) {
- log.info("鍓�3鏉¤褰曡鎯�:");
- for (int i = 0; i < Math.min(3, list.size()); i++) {
- MaintenanceStandardImport item = list.get(i);
- log.info("绗瑊}鏉�: NO={}, 鐐规鏉′欢={}, 閮ㄤ綅鍚嶇О={}, 鐐规鍐呭={}",
- i+1, item.getItemCode(), item.getCondition(),
- item.getItemPart(), item.getItemName());
+ //鏄庣粏椤�
+ List<EamMaintenanceStandardDetail> tableList = new ArrayList<>();
+ for(MaintenanceStandardImport maintenanceStandardImport : list) {
+ try {
+ Integer.valueOf(maintenanceStandardImport.getItemCode());
+ } catch (NumberFormatException e) {
+ break;
}
- } else {
- log.warn("鏈鍙栧埌浠讳綍鏄庣粏璁板綍");
+ tableList.add(new EamMaintenanceStandardDetail(maintenanceStandardImport));
}
- //鏄庣粏椤�
- List<EamMaintenanceStandardDetail> tableList = list.stream().map(EamMaintenanceStandardDetail::new).collect(Collectors.toList());
standardRequest.setTableDetailList(tableList);
log.info("杞崲鍚庣殑鏄庣粏鏁伴噺: {}", tableList.size());
--
Gitblit v1.9.3