From 43ab09b69686d72a4e3b75a23c52ab98314be25a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 26 十月 2026 13:53:52 +0800
Subject: [PATCH] feat(device): 核查计划明细设备型号独立存储不再拼接进设备名称；设备导入模板与校验文案统一设备名称命名
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
index da709e6..1c076e2 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
@@ -176,6 +176,7 @@
throw new ErrorException("璁惧缂栧彿" + examinePlanDetail.getDeviceNumber() + "鏈煡璇㈠埌鏍告煡浜�");
}
examinePlanDetail.setDeviceId(device.getId());
+ examinePlanDetail.setDeviceModel(device.getSpecificationModel());
examinePlanDetail.setCheckChargerUserId(user.getId());
}
@@ -510,11 +511,8 @@
DeviceExaminePlanDetails detail = new DeviceExaminePlanDetails();
detail.setPlanId(plan.getPlanId());
detail.setDeviceId(device.getId());
- String deviceName = device.getDeviceName() == null ? "" : device.getDeviceName();
- if (StringUtils.isNotBlank(device.getSpecificationModel())) {
- deviceName = deviceName + " " + device.getSpecificationModel();
- }
- detail.setDeviceName(deviceName);
+ detail.setDeviceName(device.getDeviceName() == null ? "" : device.getDeviceName());
+ detail.setDeviceModel(device.getSpecificationModel());
detail.setDeviceNumber(device.getManagementNumber());
detail.setCheckTime(checkTime);
deviceExaminePlanDetailsMapper.insert(detail);
@@ -587,11 +585,8 @@
DeviceExaminePlanDetails detail = new DeviceExaminePlanDetails();
detail.setPlanId(plan.getPlanId());
detail.setDeviceId(device.getId());
- String deviceName = device.getDeviceName() == null ? "" : device.getDeviceName();
- if (StringUtils.isNotBlank(device.getSpecificationModel())) {
- deviceName = deviceName + " " + device.getSpecificationModel();
- }
- detail.setDeviceName(deviceName);
+ detail.setDeviceName(device.getDeviceName() == null ? "" : device.getDeviceName());
+ detail.setDeviceModel(device.getSpecificationModel());
detail.setDeviceNumber(device.getManagementNumber());
String detailCheckTime = normalizeCheckDate(checkTime);
detail.setCheckTime(StringUtils.isBlank(detailCheckTime) ? checkMonth : detailCheckTime);
--
Gitblit v1.9.3