From f07a0b2091144e2b1d10a8850ac15e884639a408 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 12 六月 2025 11:44:43 +0800
Subject: [PATCH] art: 设备管理-设备履历修改

---
 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