From 6ff0f3e9cbb0b0f138fdabedeb23531d3cf06f1f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 31 七月 2025 11:17:29 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 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 159c091..0bb1baa 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
@@ -589,19 +589,21 @@
return Result.error(name + ": 璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞");
}
}
- if (eamMaintenanceStandardOld.getEquipmentId().equals(eamMaintenanceStandard.getEquipmentId())
- &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(eamMaintenanceStandard.getMaintenanceCategory())) {
- //鍗囩増鎿嶄綔锛屼綔搴熷師鏈�
- eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
- eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
- //鐗堟湰閫掑鑾峰彇鏁板瓧
- Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
- Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
- if (matcher.find()) {
- try {
- int mainVersion = Integer.parseInt(matcher.group(1));
- eamMaintenanceStandard.setStandardVersion("v" + (mainVersion + 1));
- } catch (NumberFormatException ignored) {
+ if (StrUtil.isNotEmpty(id)){
+ if (eamMaintenanceStandardOld.getEquipmentId().equals(eamMaintenanceStandard.getEquipmentId())
+ &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(eamMaintenanceStandard.getMaintenanceCategory())) {
+ //鍗囩増鎿嶄綔锛屼綔搴熷師鏈�
+ eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
+ eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
+ //鐗堟湰閫掑鑾峰彇鏁板瓧
+ Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
+ Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
+ if (matcher.find()) {
+ try {
+ int mainVersion = Integer.parseInt(matcher.group(1));
+ eamMaintenanceStandard.setStandardVersion("v" + (mainVersion + 1));
+ } catch (NumberFormatException ignored) {
+ }
}
}
}
@@ -1176,19 +1178,21 @@
}
}
- if (eamMaintenanceStandardOld.getEquipmentId().equals(standard.getEquipmentId())
- &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(standard.getMaintenanceCategory())) {
- //鍗囩増鎿嶄綔锛屼綔搴熷師鏈�
- eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
- eamMaintenanceStandardMapper.updateById(eamMaintenanceStandardOld);
- //鐗堟湰閫掑鑾峰彇鏁板瓧
- Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
- Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
- if (matcher.find()) {
- try {
- int mainVersion = Integer.parseInt(matcher.group(1));
- standard.setStandardVersion("v" + (mainVersion + 1));
- } catch (NumberFormatException ignored) {
+ if (StrUtil.isNotEmpty(id)){
+ if (eamMaintenanceStandardOld.getEquipmentId().equals(standard.getEquipmentId())
+ &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(standard.getMaintenanceCategory())) {
+ //鍗囩増鎿嶄綔锛屼綔搴熷師鏈�
+ eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
+ eamMaintenanceStandardMapper.updateById(eamMaintenanceStandardOld);
+ //鐗堟湰閫掑鑾峰彇鏁板瓧
+ Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
+ Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
+ if (matcher.find()) {
+ try {
+ int mainVersion = Integer.parseInt(matcher.group(1));
+ standard.setStandardVersion("v" + (mainVersion + 1));
+ } catch (NumberFormatException ignored) {
+ }
}
}
}
--
Gitblit v1.9.3