From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 5de0d90..1014cc6 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -11,8 +11,21 @@
and material_id = #{materialId}
</select>
+
<!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
- <select id="pageProductInformation" resultType="java.util.Map">
+ <resultMap id="pageProductInformationMap" type="map">
+ <id property="name" column="father"/>
+ <collection property="children" resultMap="pageProductInformationTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="pageProductInformationTowMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="unit" column="unit"/>
+ <result property="required" column="required"/>
+ <result property="internal" column="internal"/>
+ </resultMap>
+
+ <select id="pageProductInformation" resultMap="pageProductInformationMap">
select id,
name,
father,
@@ -23,4 +36,10 @@
where state = 1
and specifications_id = #{specificationsId}
</select>
+
+ <select id="deleteList">
+ update lims_laboratory.product
+ set state=0
+ where id in (${ids})
+ </select>
</mapper>
--
Gitblit v1.9.3