From 032e22721e5d2ab747b6d9db069161dc860a22b7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 22:02:37 +0800
Subject: [PATCH] 新增设备台账导入校验；新增导入维修校验，修改二保三保导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 2df2d93..56d59d2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -762,6 +762,7 @@
// 鍒涘缓椤圭洰璇︽儏
EamMaintenanceStandardDetail detail = new EamMaintenanceStandardDetail();
detail.setStandardId(standard.getId());
+ detail.setItemCode(Integer.parseInt(getCellStringValue(row.getCell(0))));
detail.setItemName(getCellStringValue(row.getCell(1)));
detail.setItemCategory(itemCategory);
@@ -960,7 +961,6 @@
List<XWPFTable> tables = doc.getTables();
EamMaintenanceStandard standard = null;
- boolean firstTableProcessed = false;
List<EamMaintenanceStandardDetail> items = new ArrayList<>();
String standardId = null;
@@ -1045,15 +1045,17 @@
if (!items.isEmpty()) {
items.remove(0);
}
-
// 2. 涓虹己澶遍儴浣嶇殑鏁版嵁濉厖鍓嶄竴鏉＄殑淇濆吇閮ㄤ綅
String lastPart = "";
+ int i =1;
for (EamMaintenanceStandardDetail item : items) {
+ item.setItemCode(i);
if (item.getItemPart() != null && !item.getItemPart().isEmpty()) {
lastPart = item.getItemPart();
} else if (!lastPart.isEmpty()) {
item.setItemPart(lastPart);
}
+ i++;
}
}
}
@@ -1185,7 +1187,7 @@
} else if (cellContents.size() == 1) {
// 鍗曞垪妯″紡锛氳涓哄唴瀹�
item.setItemName(cellContents.get(0));
- } else if (cellContents.isEmpty() && !isRowEmpty(row)) {
+ } else if (!isRowEmpty(row)) {
// 鐗规畩澶勭悊锛氳闈炵┖浣嗘病鏈夋彁鍙栧埌鍐呭锛堝彲鑳芥槸澶嶆潅鍚堝苟鍗曞厓鏍硷級
// 灏濊瘯鎻愬彇鏁磋鏂囨湰浣滀负鍐呭
StringBuilder content = new StringBuilder();
--
Gitblit v1.9.3