From 21cbdad6f59a045910b22bb3bf771e47d56c096f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index e588f05..0cae0d9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
@@ -100,8 +100,28 @@
}
break;
case SECOND_MAINTENANCE:
+ if (result instanceof EamSecondMaintenanceOrder) {
+ EamSecondMaintenanceOrder order = (EamSecondMaintenanceOrder) result;
+ if (SecondMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getConfirmComment());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case THIRD_MAINTENANCE:
+ if (result instanceof EamThirdMaintenanceOrder) {
+ EamThirdMaintenanceOrder order = (EamThirdMaintenanceOrder) result;
+ if (ThirdMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getLeaderConfirmComment());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case REPORT_REPAIR:
if (result instanceof EamReportRepair) {
--
Gitblit v1.9.3