From 3661612cc6c99bccf0fb6a212d22c51ee7841c6e Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 14 七月 2025 09:49:09 +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, 3 insertions(+), 3 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 0cae0d9..0f0e9cf 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,8 +117,8 @@ if (ThirdMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) { log.setEquipmentId(order.getEquipmentId()); log.setBusinessId(order.getId()); - log.setOperator(order.getOperator()); - log.setDescription(order.getLeaderConfirmComment()); + log.setOperator(order.getRepairman()); + log.setDescription(order.getProblemDescription()); log.setCreateTime(order.getActualEndTime()); } } -- Gitblit v1.9.3