From 3d397976d08f0359b8cfeb4e4f22403ae5d0c04f Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 24 十月 2026 20:44:14 +0800
Subject: [PATCH] feat(device): 设备核查计划附件与设备使用记录联动改造
---
cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
index 26dc79b..571542b 100644
--- a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
+++ b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
@@ -5,9 +5,12 @@
<select id="deviceRecordPage" resultType="com.ruoyi.device.dto.DeviceRecordDto">
select dr.*,
d.device_name,
- d.management_number
+ d.specification_model,
+ d.management_number,
+ o.entrust_code as order_code
from device_record dr
left join device d on d.id = dr.device_id
+ left join ins_order o on o.id = dr.ins_order_id
where 1=1
<if test="deviceId != null">
and dr.device_id = #{deviceId}
@@ -37,7 +40,10 @@
<!-- 鏌ヨ瀵煎嚭璁惧浣跨敤璁板綍 -->
<select id="selectExportList" resultType="com.ruoyi.device.dto.DeviceRecordDto">
- select dr.*
+ select dr.*,
+ d.device_name,
+ d.specification_model,
+ d.management_number
from device_record dr
left join device d on d.id = dr.device_id
where dr.use_start_date is not null
--
Gitblit v1.9.3