From e2c5017787d7fc5eea2afb8bc84bca0db054ad8c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 17:46:36 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
inspect-server/src/main/resources/mapper/ReliabilityPlanProductItemMapper.xml | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/ReliabilityPlanProductItemMapper.xml b/inspect-server/src/main/resources/mapper/ReliabilityPlanProductItemMapper.xml
index b0eaee6..3714c6e 100644
--- a/inspect-server/src/main/resources/mapper/ReliabilityPlanProductItemMapper.xml
+++ b/inspect-server/src/main/resources/mapper/ReliabilityPlanProductItemMapper.xml
@@ -56,5 +56,36 @@
LEFT JOIN standard_method sm ON sm.id = spl.standard_method_list_id
WHERE rp.id = #{planId}
</select>
-
+ <select id="materialItem" resultType="java.util.Map">
+ SELECT
+ sp.inspection_item AS inspectionItem
+ FROM
+ structure_item_parameter sp
+ CROSS JOIN JSON_TABLE (sp.sample, '$[*][*]' COLUMNS (VALUE VARCHAR (255) PATH '$')) AS jt
+ JOIN reliability_plan_material rp ON rp.material_name = jt.
+ VALUE
+ AND rp.id = #{planId}
+ GROUP BY
+ sp.id,
+ sp.inspection_item
+ UNION ALL
+ SELECT
+ inspection_item AS inspectionItem
+ FROM
+ structure_item_parameter
+ WHERE
+ sample IS NULL
+ OR sample = ''
+ OR sample = '[]'
+ ORDER BY
+ inspectionItem ASC;
+ </select>
+ <select id="materialCodeList" resultType="java.util.Map">
+ SELECT DISTINCT sm.`code` as standard, sm.id
+ FROM (SELECT material_name
+ FROM reliability_plan_material
+ WHERE id = #{planId}) rm
+ JOIN standard_product_list spl ON spl.sample = rm.material_name AND spl.sample IS NOT NULL
+ JOIN standard_method sm ON sm.id = spl.standard_method_list_id;
+ </select>
</mapper>
--
Gitblit v1.9.3