From 2f07589b54d56085af77b50d580890cd4130b444 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:19:53 +0800
Subject: [PATCH] 设备模块后端业务规则、计划接口与日期联动
---
cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
index 8a5e3cf..26dc79b 100644
--- a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
+++ b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
@@ -39,10 +39,17 @@
<select id="selectExportList" resultType="com.ruoyi.device.dto.DeviceRecordDto">
select dr.*
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