From 4f55d3cb4bc644e4534106336f2047af1a4db5df Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 29 五月 2026 18:09:46 +0800
Subject: [PATCH] feat(config): 添加新环境配置并扩展设备台账功能
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index e5a73ac..9a3c383 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -67,6 +67,7 @@
DeviceLedger byId = deviceLedgerService.getById(deviceRepairDto.getDeviceLedgerId());
deviceRepairDto.setDeviceName(byId.getDeviceName());
deviceRepairDto.setDeviceModel(byId.getDeviceModel());
+ deviceRepairDto.setAreaId(byId.getAreaId());
if (deviceRepairDto.getStatus() == null) {
deviceRepairDto.setStatus(STATUS_PENDING_REPAIR);
}
@@ -86,6 +87,15 @@
if (oldDeviceRepair == null) {
return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
+ Long effectiveDeviceLedgerId = deviceRepairDto.getDeviceLedgerId() != null
+ ? deviceRepairDto.getDeviceLedgerId()
+ : oldDeviceRepair.getDeviceLedgerId();
+ DeviceLedger byId = deviceLedgerService.getById(effectiveDeviceLedgerId);
+ if (byId != null) {
+ deviceRepairDto.setDeviceName(byId.getDeviceName());
+ deviceRepairDto.setDeviceModel(byId.getDeviceModel());
+ deviceRepairDto.setAreaId(byId.getAreaId());
+ }
if (deviceRepairDto.getStatus() != null
&& deviceRepairDto.getStatus() == STATUS_COMPLETED
&& (oldDeviceRepair.getStatus() == null
--
Gitblit v1.9.3