From fc4f4e0dd0ddb92065a81fcce6e99cc5dbf80068 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 24 八月 2023 18:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 29b90c5..1014cc6 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -11,15 +11,35 @@
and material_id = #{materialId}
</select>
+
<!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
- <select id="pageProductInformation" resultType="java.util.Map">
- select name,
+ <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,
unit,
required,
internal
from lims_laboratory.product
- where state=1
- and specifications_id=#{specificationsId}
+ 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