From ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 12:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index e8b009f..e1188f1 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -21,19 +21,24 @@
ip.inspection_item,
if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(ip.sample, '[["', ''), '"]]', 1)) sample,
ddc.formula,
ddc.referx,
ddc.refery,
ddc.x,
ddc.y,
- ddc.id
+ 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
- if(ip.inspection_item_subclass is not null and
- ip.inspection_item_subclass != '', ip.inspection_item_subclass,
- ip.inspection_item) = ddc.inspection_item_subclass and
- ip.inspection_item = ddc.inspection_item
+ left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
where d.id = #{deviceId}
</select>
+
+ <select id="deleteDataConfig" resultType="integer">
+ SELECT ddc.id
+ FROM device d
+ 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>
</mapper>
--
Gitblit v1.9.3