From 179b7b6c557eec27f5a05ee7ed2981f14825b692 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/resources/mapper/ProductMapper.xml |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 94b96e4..b2fefbc 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -71,4 +71,36 @@
         where state = 1
           and specifications_id = #{modelId}
     </select>
+
+    <!--鏍规嵁椤圭洰鐖剁被,鍨嬪彿id,鐗堟湰鏌ヨ浜岀骇璇︽儏-->
+    <select id="selFath" resultMap="pageProductInformationMap">
+        select id,
+               name,
+               father,
+               unit,
+               required,
+               internal,
+               version
+        from lims_laboratory.product
+        where state = 1
+          and specifications_id = #{specificationId}
+          and version = #{version}
+          and father = #{exper}
+    </select>
+
+    <!--鏍规嵁椤圭洰鐖剁被涓虹┖,椤圭洰鍚�,鍨嬪彿id,鐗堟湰鏌ヨ-->
+    <select id="selNam" resultType="java.util.Map">
+        select id,
+               name,
+               unit,
+               required,
+               internal,
+               version
+        from lims_laboratory.product
+        where state = 1
+          and specifications_id = #{specificationId}
+          and version = #{version}
+          and name = #{exper}
+          and father is null
+    </select>
 </mapper>

--
Gitblit v1.9.3