From 2de0bc2174bbec2a48db059d3850f0529c0539fc Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 七月 2024 23:09:05 +0800
Subject: [PATCH] 数采bug调整
---
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 7701b02..592af80 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -21,18 +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.ins_product_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="com.yuanchu.mom.pojo.DataConfig">
+ SELECT ddc.*
+ 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