From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/MaterialMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 8853a62..8ff48cb 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -3,12 +3,12 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
<select id="selectMaterialLimit" resultType="Map">
- select id, name
+ select id, code, name
from lims_laboratory.material
where state = 1
- and type = #{type}
+ and type = #{type}
order by create_time desc
- limit #{num1},#{num2}
+ limit #{num1}, #{num2}
</select>
<select id="selectMaterialById" resultType="Map">
select m.id,
@@ -28,6 +28,45 @@
lims_laboratory.serial_number sn
where m.specifications_id = s.id
and s.serial_id = sn.id
- and m.id=#{materialId}
+ and m.id = #{materialId}
+ </select>
+
+ <resultMap id="OneLevelTreeMap" type="Map">
+ <id property="id" column="materialId"/>
+ <result property="name" column="materialName"/>
+ <collection property="children" resultMap="TwoLevelTreeMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="TwoLevelTreeMap" type="Map">
+ <id property="id" column="standardId"/>
+ <result property="name" column="standardName"/>
+ <collection property="children" resultMap="ThreeLevelTreeMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="ThreeLevelTreeMap" type="Map">
+ <id property="id" column="specificationsId"/>
+ <result property="name" column="specificationsName"/>
+ <collection property="children" resultMap="FourLevelTreeMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="FourLevelTreeMap" type="Map">
+ <id property="id" column="productId"/>
+ <result property="name" column="productName"/>
+ </resultMap>
+
+ <select id="FourTree" resultMap="OneLevelTreeMap">
+ SELECT m.`id` materialId, m.`name` materialName, s.`id` standardId, s.`name` standardName,
+ f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName
+ FROM material m
+ LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s ON m.id =
+ s.`material_id`
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1
+ <if test="specificationsName != null and specificationsName != ''">
+ AND f.`name` = #{specificationsName}
+ </if>
+ ) f ON s.`id` = f.`standard_id`
+ LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM product p WHERE p.`state` = 1) p ON f.`id` =
+ p.`specifications_id`
+ WHERE m.`state` = 1
</select>
</mapper>
--
Gitblit v1.9.3