From f6fcea400ef3e1ae23607c1cb4da776a70fc4240 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 15:11:51 +0800
Subject: [PATCH] 合格率统计修改

---
 laboratory-server/src/main/resources/mapper/InstrumentMapper.xml |   21 ++++++++++++++-------
 1 files changed, 14 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..5031258 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -23,23 +23,30 @@
 
     <!--閫夋嫨璁惧-->
     <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>
+    <select id="getInstrument" resultType="map">
+        select id,equipment_name equipmentName from instrument  where 1=1  and state=1 and conditions=5
     </select>
 </mapper>

--
Gitblit v1.9.3