From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 26 ++++++++++++++++++++++----
1 files changed, 22 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..40bcc1f 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -93,15 +93,33 @@
<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 ip.inspection_item_subclass FROM ins_product ip
+ where ip.ins_sample_id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3