From 2db869d05f4a9156b5799fbb534c4080aac04acb Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 七月 2025 11:12:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 3aa977a..73913b9 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
@@ -566,7 +566,7 @@
if (exist != null) {
return Result.error(name + ": 璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞");
}
-
+ eamMaintenanceStandard.setInitialDate(new Date());
eamMaintenanceStandardMapper.insert(eamMaintenanceStandard);
Map<Integer, String> rowErrors = new HashMap<>();
@@ -1081,6 +1081,21 @@
String fileName = file.getOriginalFilename();
try (XWPFDocument doc = new XWPFDocument(file.getInputStream())) {
+ // 鑾峰彇鏂囨。鏍囬锛堢涓�涓潪绌烘钀斤級
+ String documentTitle = null;
+ for (XWPFParagraph p : doc.getParagraphs()) {
+ String text = p.getText();
+ if (text != null && !text.trim().isEmpty()) {
+ documentTitle = text.trim();
+ break; // 鎵惧埌绗竴涓潪绌烘钀藉嵆閫�鍑�
+ }
+ }
+
+ // 鍩虹楠岃瘉
+ if (doc.getTables().isEmpty()) {
+ return Result.error(fileName + ": 鏂囨。涓湭鎵惧埌琛ㄦ牸");
+ }
+
// 鍩虹楠岃瘉
if (doc.getTables().isEmpty()) {
return Result.error(fileName + ": 鏂囨。涓湭鎵惧埌琛ㄦ牸");
@@ -1114,6 +1129,7 @@
if (exist != null) {
return Result.error(fileName + ": 璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞");
}
+ standard.setStandardName(documentTitle);
eamMaintenanceStandardMapper.insert(standard);
standardId = standard.getId();
--
Gitblit v1.9.3