From 74a2422fd20075e3aca6e2b059073bd65d895cc4 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 14:16:20 +0800
Subject: [PATCH] 修改word导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 67 ++++++++++-----------------------
2 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
index b320af0..ce8b3fb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
@@ -52,7 +52,7 @@
* @param maintenanceCategory 淇濆吇绫诲瀷
* @return
*/
- EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory);
+ EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory,String standardStatus);
/**
* 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
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 06054ef..744c185 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
@@ -181,7 +181,7 @@
//鍒犻櫎鏍囪
entity.setDelFlag(CommonConstant.DEL_FLAG_0);
//閲嶅鎬ф牎楠�
- EamMaintenanceStandard exist = checkDuplicate(entity.getEquipmentId(), entity.getMaintenanceCategory());
+ EamMaintenanceStandard exist = checkDuplicate(entity.getEquipmentId(), entity.getMaintenanceCategory(),MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
if(exist != null){
throw new JeecgBootException("璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
}
@@ -265,7 +265,7 @@
//鍒犻櫎鏍囪
newEntity.setDelFlag(CommonConstant.DEL_FLAG_0);
//閲嶅鎬ф牎楠�
- EamMaintenanceStandard exist = checkDuplicate(newEntity.getEquipmentId(), newEntity.getMaintenanceCategory());
+ EamMaintenanceStandard exist = checkDuplicate(newEntity.getEquipmentId(), newEntity.getMaintenanceCategory(),MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
if(exist != null){
throw new JeecgBootException("璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
}
@@ -286,12 +286,12 @@
}
@Override
- public EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory) {
+ public EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory,String standardStatus) {
LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EamMaintenanceStandard::getEquipmentId, equipmentId);
queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory);
queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
- queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
+ queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, standardStatus);
queryWrapper.orderByDesc(EamMaintenanceStandard::getStandardVersion);
List<EamMaintenanceStandard> list = eamMaintenanceStandardMapper.selectList(queryWrapper);
@@ -567,6 +567,12 @@
}
eamMaintenanceStandard.setStandardName(name);
+
+ EamMaintenanceStandard exist = checkDuplicate(eamMaintenanceStandard.getEquipmentId(), eamMaintenanceStandard.getMaintenanceCategory(),MaintenanceStandardStatusEnum.START.name());
+ if(exist != null){
+ return Result.error(name + ": 璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞");
+ }
+
eamMaintenanceStandardMapper.insert(eamMaintenanceStandard);
// 2. 鎻愬彇姣忔棩鐐规椤圭洰
@@ -967,13 +973,17 @@
}
// 鎻愬彇璁惧淇℃伅
- standard = extractDeviceInfo(table);
+ standard = extractDeviceInfo(table,type);
if (standard == null) {
return Result.error(fileName + ": 璁惧淇℃伅鎻愬彇澶辫触");
}
// 閰嶇疆绫诲瀷鐩稿叧鍙傛暟
configureStandard(standard, type, file);
+ EamMaintenanceStandard exist = checkDuplicate(standard.getEquipmentId(), standard.getMaintenanceCategory(),MaintenanceStandardStatusEnum.START.name());
+ if(exist != null){
+ return Result.error(fileName + ": 璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞");
+ }
eamMaintenanceStandardMapper.insert(standard);
standardId = standard.getId();
@@ -1257,7 +1267,7 @@
/**
* 鎻愬彇璁惧鍩烘湰淇℃伅
*/
- private EamMaintenanceStandard extractDeviceInfo(XWPFTable table) {
+ private EamMaintenanceStandard extractDeviceInfo(XWPFTable table,String type) {
if (table.getNumberOfRows() < 2) return null;
// 鎻愬彇鍓嶄袱琛屾暟鎹�
@@ -1279,15 +1289,15 @@
}else {
standard.setEquipmentId(equipments.getId());
}
+ if (type.equals("THIRD")){
+ EamEquipmentExtend eamEquipmentExtend=eamEquipmentExtendService.getById(standard.getEquipmentId());
+ standard.setMaintenancePeriod(eamEquipmentExtend.getThirdMaintenancePeriod());
+ }
}
return standard;
}
- // 绠�鏄撶増瀛楃涓查潪绌哄垽鏂�
- private boolean isNotBlank(String str) {
- return str != null && !str.trim().isEmpty();
- }
/**
* 琛ㄦ牸琛屾暟鎹В鏋�
@@ -1371,21 +1381,6 @@
}
/**
- * 鍒涘缓淇濆吇椤圭洰
- */
- private EamMaintenanceStandardDetail createItem(
- EamMaintenanceStandardDetailCategory category,
- String content,
- String standardId) {
-
- EamMaintenanceStandardDetail item = new EamMaintenanceStandardDetail();
- item.setItemCategory(category.name());
- item.setStandardId(standardId);
- item.setItemName(cleanContent(content));
- return item;
- }
-
- /**
* 鍏煎鐗堝崟鍏冩牸鏂囨湰鎻愬彇
*/
private String getCellText(XWPFTableCell cell) {
@@ -1405,28 +1400,6 @@
}
}
return text.toString();
- }
-
- /**
- * 鍐呭娓呯悊
- */
- private String cleanContent(String text) {
- if (text == null) return "";
-
- // 鏇挎崲鐗规畩绌烘牸鍜屽悎骞惰繛缁┖鏍�
- text = text.replace('\u00A0', ' ')
- .replace('\u2007', ' ')
- .replace('\u202F', ' ')
- .replaceAll("\\s+", " ");
-
- // 瑙勮寖鏍囩偣绗﹀彿
- return text.replace(',', '銆�')
- .replace('锛�', '銆�')
- .replace(';', '锛�')
- .replace('锛�', '锛�')
- .replace(':', '锛�')
- .replace('锛�', '锛�')
- .trim();
}
/**
--
Gitblit v1.9.3