From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-device/src/main/resources/mapper/DataConfigMapper.xml | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
index c28aac6..b5dac74 100644
--- a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
@@ -13,32 +13,14 @@
</resultMap>
<select id="selectDataConfigList" resultType="com.ruoyi.device.dto.DeviceConfigDtoPage">
- SELECT d.device_name,
- d.file_type,
- d.collect_url,
- d.storage_url,
- d.ip,
- d.entrust_code,
- d.sample_code,
- d.db_file_name,
- ip.inspection_item,
- ip.inspection_item_class,
- if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
- ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
- ip.sample,
- ddc.formula,
- ddc.referx,
- ddc.refery,
- ddc.x,
- ddc.y,
- ddc.another_name,
- ddc.matching_name,
- ddc.id,
- ip.id structureItemParameterId
- FROM device d
- left join structure_item_parameter ip on FIND_IN_SET(ip.id, d.ins_product_ids)
- left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
+ SELECT ddc.*,
+ d.device_name,
+ sip.sample
+ FROM device_data_config ddc
+ left join device d on ddc.device_id = d.id
+ left join structure_item_parameter sip on sip.id = ddc.structure_item_parameter_id
where d.id = #{deviceId}
+ order by ddc.id desc
</select>
<select id="deleteDataConfig" resultType="integer">
@@ -47,4 +29,19 @@
left join structure_item_parameter ip on not FIND_IN_SET(ip.id, d.ins_product_ids)
inner join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
</select>
+ <select id="getNoConfigProduct" resultType="com.ruoyi.device.pojo.DataConfig">
+ SELECT d.id device_id,
+ ip.inspection_item,
+ ip.inspection_item_class,
+ ip.inspection_item_subclass ,
+ ip.sample,
+ ip.id structureItemParameterId,
+ ddc.id
+ FROM structure_item_parameter ip
+ left join device d on FIND_IN_SET(d.id, ip.device_ids)
+ left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
+ where d.id = #{deviceId}
+ and ddc.id is null
+ order by ip.sample
+ </select>
</mapper>
--
Gitblit v1.9.3