From 84759dac1add86112a974fb5fb0bf0e7f5921362 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 17:03:55 +0800
Subject: [PATCH] 坤泰 设备保养备件领用查询
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 3 ++-
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index a941d13..4a45351 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -67,6 +67,7 @@
.filter(StrUtil::isNotBlank)
.map(ids -> Arrays.stream(StringUtils.split(ids, ","))
.map(String::trim)
+ .map(Long::valueOf)
.map(idToNameMap::get)
.filter(Objects::nonNull)
.collect(Collectors.joining(",")))
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2ed16a4..89f6b0c 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -20,7 +20,8 @@
dm.maintenance_actually_name,
dl.device_name,
dl.device_model,
- su.nick_name as create_user_name
+ su.nick_name as create_user_name,
+ dm.spare_parts_ids
from device_maintenance dm
left join device_ledger dl on dm.device_ledger_id = dl.id
left join sys_user su on dm.create_user = su.user_id
--
Gitblit v1.9.3