From 5739e2493dddb671a11869a1c11ea57949319263 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 30 七月 2025 14:49:34 +0800
Subject: [PATCH] 设备台账表设备管理员字段调整（已去掉WK前缀），去掉消息推送逻辑中截取WK前缀的操作
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 6 +-----
2 files changed, 2 insertions(+), 6 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 5bbc1af..ea48b01 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
@@ -449,11 +449,7 @@
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- //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("NextAssignee", equipment.getEquipmentManager().split(","));
values.put("status", 1);
request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index 8c2cb51..6e9ea5d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -562,7 +562,7 @@
}
//鐝粍闀跨‘璁�
userApprovalList = new ArrayList<>();
- userApprovalList.add(equipment.getEquipmentManager().substring(2));//璁惧鍙拌处琛ㄧ淮鎶ょ殑璁惧绠＄悊鍛樺伐鍙锋槸甯� WK鍓嶇紑鐨�
+ userApprovalList.add(equipment.getEquipmentManager());
values.put("dataId", entity.getId());
values.put("organization", request.getConfirmComment());
values.put("comment", request.getConfirmComment());
--
Gitblit v1.9.3