From 836986e000c23a66897953e1cdbbffe5fd2e47ca Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 31 十二月 2020 16:56:43 +0800
Subject: [PATCH] bug修改 和页面调整
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
index 58945c0..50dd15a 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -174,11 +174,15 @@
</select>
<select id="getOpeReagentStatusInfoList" parameterType="java.util.Map" resultMap="OpeReagentStatus">
- select s.id ,name,cas, deadline,reagent_code,bm3.meta_value reagent_format,r.main_metering,bm1.meta_value reagent_type,bm2.meta_value product_home from ope_reagent_status s
+ select s.id ,name,cas, deadline,reagent_code,bm3.meta_value reagent_format,r.main_metering,bm1.meta_value reagent_type,bm2.meta_value product_home,
+ bm4.meta_value reagent_unit,
+ s.article_number
+ from ope_reagent_status s
left join sys_reagent r on r.id = s.reagent_id
left join base_meta bm1 on bm1.id = r.reagent_type
left join base_meta bm2 on bm2.id = r.product_home
left join base_meta bm3 on bm3.id = r.reagent_format
+ left join base_meta bm4 on bm4.id = r.reagent_unit
where s.update_time >= #{startTime} and #{endTime} > s.update_time
<if test="containerid != null">
and s.container_id = #{containerid}
--
Gitblit v1.9.2