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'
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 98a6181..ab1509d 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -23,23 +23,27 @@
<!--閫夋嫨璁惧-->
<resultMap id="chooseinstumMap" type="map">
- <id property="father_name" column="father_name"/>
- <collection property="father" resultMap="chooseinstumTowMap" javaType="List"/>
+ <id property="id" column="cid"/>
+ <result property="name" column="father_name"/>
+ <collection property="children" resultMap="chooseinstumTowMap" javaType="List"/>
</resultMap>
<resultMap id="chooseinstumTowMap" type="map">
- <id property="son_name" column="son_name"/>
- <collection property="chldren" resultMap="chooseinstumTowsMap" javaType="List"/>
+ <id property="id" column="cid"/>
+ <result property="name" column="son_name"/>
+ <collection property="children" resultMap="chooseinstumTowsMap" javaType="List"/>
</resultMap>
<resultMap id="chooseinstumTowsMap" type="map">
<id property="id" column="id"/>
<result property="name" column="name"/>
</resultMap>
<select id="chooseinstum" resultMap="chooseinstumMap">
- select instrument.id,
- father_name,
- son_name,
+ select c.id cid,
+ instrument.id,
+ father_name ,
+ son_name ,
equipment_name name
from lims_laboratory.instrument
left join lims_laboratory.classify c on c.id = instrument.classify_id
+ where conditions in(1,5)
</select>
</mapper>
--
Gitblit v1.9.3