From 844ffa2181d698f3871a62553fe10dd4054b63fa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/RawInsProductMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/RawInsProductMapper.xml b/standard-server/src/main/resources/mapper/RawInsProductMapper.xml
index 5f7d431..94f8892 100644
--- a/standard-server/src/main/resources/mapper/RawInsProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/RawInsProductMapper.xml
@@ -15,4 +15,20 @@
<select id="selectPageDevice" resultType="map">
</select>
+
+ <select id="inspectIdSelect" resultType="map">
+ SELECT r.`name`, r.`specifications`, r.`user_name`
+ FROM raw_inspect r, raw_ins_product p
+ WHERE p.`id` = #{inspectId}
+ AND p.`state` = 1
+ AND r.`state` = 1
+ AND r.`id` = p.`raw_inspect_id`
+ </select>
+
+ <select id="parentClassification" resultType="map">
+ SELECT DISTINCT d.`father`
+ FROM device d
+ WHERE d.`state` = 1
+ AND d.`father` IS NOT NULL
+ </select>
</mapper>
--
Gitblit v1.9.3