From d1d6771a32edca40f88a800459442279c00f6867 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 07 八月 2023 17:52:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 7596baa..e7d4c70 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -5,15 +5,25 @@
<select id="pageProductInformation" resultType="map">
SELECT COUNT(1) num, p.`father`
FROM product p
+ WHERE p.`specifications_id` = #{specificationsId}
<if test="productCodeOrName != null and productCodeOrName != ''">
- WHERE p.`father` = #{productCodeOrName}
+ AND p.`father` = #{productCodeOrName}
</if>
GROUP BY p.`father`
</select>
<select id="selectOneChildren" resultType="map">
- SELECT p.`id`, p.`unit`, p.`required`, p.`internal`
+ SELECT p.`id`, p.`name`, p.`unit`, p.`required`, p.`internal`
FROM product p
WHERE p.`father` = #{father}
</select>
+ <select id="selectProductByMaterialId" resultType="Map">
+ select p.name,unit,required,internal
+ from lims_laboratory.product p,
+ lims_laboratory.specifications sp,
+ lims_laboratory.standard st
+ where specifications_id=sp.id
+ and standard=st.id
+ and material_id=#{materialId}
+ </select>
</mapper>
--
Gitblit v1.9.3