From 1ab5a65898b12ca07cbf38eaf2028eeae2ce790c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 10:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 3529109..b2fefbc 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -38,6 +38,7 @@
where state = 1
and specifications_id = #{specificationsId}
and version = #{version}
+ ORDER BY product.`create_time` DESC
</select>
<select id="deleteList">
@@ -70,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