From 2f467298075f6eb3bc40ecfa6da88c009f7fd0f8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:32:14 +0800
Subject: [PATCH] 成品复测功能修改
---
cnas-device/src/main/resources/mapper/DeviceMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
index 2d5c6c8..a254044 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
@@ -89,13 +89,8 @@
, #{createUser}
, #{createTime})
</select>
- <select id="selectDevicePrincipal" resultType="com.ruoyi.device.pojo.Device">
- select id,
- equipment_manager
- from device
- </select>
- <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.pojo.Device">
+ <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.dto.DeviceDto">
select * from(
SELECT
d.*,
@@ -186,4 +181,20 @@
u1.name,
u2.name
</select>
+
+ <select id="selectByKeys" resultType="com.ruoyi.device.pojo.Device">
+ SELECT
+ id, device_name, specification_model, management_number,
+ manufacturer, factory_no, technical_indicators, acquisition_date,
+ activation_date, equipment_manager, storage_point, subordinate_departments_id,
+ calibration_services, last_calibration_date, next_calibration_date, large_category,
+ unit_price, device_status, calibration_date, image_upload, image_name
+ FROM device
+ WHERE
+ <foreach collection="keys" item="key" separator=" OR " open="(" close=")">
+ (device_name = #{key.deviceName}
+ AND specification_model = #{key.specModel}
+ AND management_number = #{key.manageNumber})
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3