From dd43f10cba754d4a7b371b9bf39db262b94d3c10 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 七月 2024 15:43:59 +0800
Subject: [PATCH] 数采报错修复
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 721840b..60660a3 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -93,15 +93,34 @@
<select id="selectDeviceParameterPage" resultType="com.yuanchu.mom.dto.DeviceDto">
select * from(
SELECT
- d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName, i.inspection_item insProductItem
+ d.*,
+ GROUP_CONCAT(
+ CONCAT_WS(', ',
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1)),
+ inspection_item,
+ inspection_item_subclass
+ )
+ SEPARATOR ';'
+ ) AS insProductItem,
+ u.name ,
+ l.laboratory_name
FROM
device d
- left join `user` u on u.id = d.equipment_manager
- left join laboratory l on l.id = d.subordinate_departments_id
- left join ins_product i on i.id = d.ins_product_ids
+ LEFT JOIN `user` u ON u.id = d.equipment_manager
+ LEFT JOIN laboratory l ON l.id = d.subordinate_departments_id
+ LEFT JOIN structure_item_parameter sip ON FIND_IN_SET(sip.id, d.ins_product_ids)
+ GROUP BY
+ d.id,
+ u.name, l.laboratory_name
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="getInspectionItemSubclass" resultType="java.lang.String">
+ SELECT if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
+ ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass FROM ins_product ip
+ where ip.ins_sample_id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3