From bcbdb084c3a3a0a4de8fca1aa16caf0bc4681ddf Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 27 十月 2026 09:41:51 +0800
Subject: [PATCH] feat(device): 删除核查计划明细时连带清理未审核记录和附件,已审核记录仍禁止删除
---
cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
index 8a5e3cf..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,12 +40,22 @@
<!-- 鏌ヨ瀵煎嚭璁惧浣跨敤璁板綍 -->
<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
<if test="deviceId != null">
and dr.device_id = #{deviceId}
</if>
+ <if test="sampleCode != '' and sampleCode != null">
+ and dr.sample_code like concat('%', #{sampleCode}, '%')
+ </if>
+ <if test="managementNumber != '' and managementNumber != null">
+ and d.management_number like concat('%', #{managementNumber}, '%')
+ </if>
<if test="exportDate != '' and exportDate != null">
and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate}
</if>
--
Gitblit v1.9.3