From ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 14:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 eb55e54..ac58c4f 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
@@ -106,7 +106,7 @@
log.setEquipmentId(order.getEquipmentId());
log.setBusinessId(order.getId());
log.setOperator(order.getOperator());
- log.setDescription(order.getConfirmComment());
+ log.setDescription(order.getInspectConfirmComment());
log.setCreateTime(order.getActualEndTime());
}
}
@@ -117,7 +117,7 @@
if (ThirdMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
log.setEquipmentId(order.getEquipmentId());
log.setBusinessId(order.getId());
- log.setOperator(order.getOperator());
+ log.setOperator(order.getRepairman());
log.setDescription(order.getProblemDescription());
log.setCreateTime(order.getActualEndTime());
}
@@ -139,8 +139,6 @@
if (ReportRepairEnum.COMPLETE.name().equals(order.getRepairStatus())) {
log.setEquipmentId(order.getEquipmentId());
log.setBusinessId(order.getId());
- log.setOperator(order.getRepairer());
- log.setDescription(order.getRepairDescription());
log.setCreateTime(order.getActualEndTime());
}
}
--
Gitblit v1.9.3