From 8ad863082097ffdcab4a8e7f426d344a1fe6f892 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 00:27:02 +0800
Subject: [PATCH] 修复人员管理接口校验与导出，完善设备保养计划与文件受控功能
---
cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
index 571542b..06c044f 100644
--- a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
+++ b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
@@ -15,6 +15,12 @@
<if test="deviceId != null">
and dr.device_id = #{deviceId}
</if>
+ <if test="deviceName != '' and deviceName != null">
+ and d.device_name like concat('%', #{deviceName}, '%')
+ </if>
+ <if test="specificationModel != '' and specificationModel != null">
+ and d.specification_model like concat('%', #{specificationModel}, '%')
+ </if>
<if test="sampleCode != '' and sampleCode != null">
and dr.sample_code like concat('%', #{sampleCode}, '%')
</if>
@@ -50,15 +56,18 @@
<if test="deviceId != null">
and dr.device_id = #{deviceId}
</if>
- <if test="sampleCode != '' and sampleCode != null">
- and dr.sample_code like concat('%', #{sampleCode}, '%')
+ <if test="deviceName != '' and deviceName != null">
+ and d.device_name like concat('%', #{deviceName}, '%')
+ </if>
+ <if test="specificationModel != '' and specificationModel != null">
+ and d.specification_model like concat('%', #{specificationModel}, '%')
</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 test="sampleCode != '' and sampleCode != null">
+ and dr.sample_code like concat('%', #{sampleCode}, '%')
</if>
- ORDER BY dr.use_start_date asc
+ ORDER BY d.device_name asc, d.id asc, dr.use_start_date asc
</select>
</mapper>
--
Gitblit v1.9.3