From cbc60421dfce8f052281714d0fa70b01d139f53c Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 17:39:15 +0800
Subject: [PATCH] 周保消息推送定时任务调整(消息只推送到二级车间层级;之前为设备所属车间,可能会存在三级车间,导致收到多条重复的消息提醒)

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
index 0d74404..db70249 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
@@ -170,9 +170,13 @@
             translateDictTextUtils.translateField("breakdownFlag", eamRepairOrder.getBreakdownFlag(), item, "breakdown_flag");
             translateDictTextUtils.translateField("faultType", eamRepairOrder.getFaultType(), item, "fault_reason_category");
             translateDictTextUtils.translateField("reportStatus", eamRepairOrder.getReportStatus(), item, "report_repair_status");
-            translateDictTextUtils.translateField("equipmentId", eamRepairOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
+            translateDictTextUtils.translateField("equipmentId", eamRepairOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
+            translateDictTextUtils.translateField("installationPosition", eamRepairOrder.getEquipmentId(), item, "eam_equipment,installation_position,id");
             translateDictTextUtils.translateField("repairStatus", eamRepairOrder.getRepairStatus(), item, "report_repair_status");
-            translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,username,realname");
+            translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,realname,username");
+            translateDictTextUtils.translateField("repairerPhone", eamRepairOrder.getRepairer(), item, "sys_user,phone,username");
+            translateDictTextUtils.translateField("reporter", eamRepairOrder.getReporter(), item, "sys_user,realname,username");
+            translateDictTextUtils.translateField("reporterPhone", eamRepairOrder.getReporter(), item, "sys_user,phone,username");
             return Result.OK(item);
         } catch (Exception e) {
             return Result.error("鏁版嵁杞瘧澶辫触锛�");

--
Gitblit v1.9.3