From 7fbb8dedb1112e1d87b8ccfb8d9df9bb763ec024 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 22 七月 2025 17:48:17 +0800
Subject: [PATCH] 点检、周保执行中设备异常报修消息推送

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index fb5c7b9..5bbc1af 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -236,6 +236,7 @@
         String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
         eamRepairOrder.setRepairCode(codeSeq);
         EamReportRepair eamReportRepair = eamReportRepairService.getById(eamReportRepairQuery.getId());
+        eamRepairOrder.setReportId(eamReportRepairQuery.getId());
         eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
         eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
         eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -448,7 +449,11 @@
                         values.put("dataId", eamRepairOrder.getId());
                         values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
                         values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
-                        values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
+                        //values.put("NextAssignee", equipment.getEquipmentManager().split(","));
+                        //璁惧鍙拌处琛ㄧ淮鎶ょ殑璁惧绠$悊鍛樺伐鍙锋槸甯� WK鍓嶇紑鐨�
+                        values.put("NextAssignee", Arrays.stream(equipment.getEquipmentManager().split(","))
+                                .map(s -> s.substring(2))
+                                .collect(Collectors.toList()));
                         values.put("status", 1);
                         request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
                         eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());

--
Gitblit v1.9.3