From b0b8ca4b383c5c3a2373200ca1872c20ee9ff999 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 14:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 092e24c..3aa5914 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -44,5 +44,9 @@
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="com.yuanchu.limslaboratory.pojo.Instrument">
+ select id,equipment_name name from instrument where 1=1 and state=1 and conditions=5
</select>
</mapper>
--
Gitblit v1.9.3