From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
index a557fe8..9480b33 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
@@ -61,7 +61,8 @@
CONCAT(location1,'-',location2)
END
location,
- bm2.meta_value department
+ bm2.meta_value department,
+ sl.project
from sys_laboratory as sl
LEFT JOIN base_meta bm1 on bm1.id = sl.type
left JOIN base_meta bm2 on bm2.id = sl.department
@@ -71,6 +72,9 @@
</if>
<if test="type != null and type != ''">
and sl.type = #{type};
+ </if>
+ <if test="project != null and project != ''">
+ and sl.project like concat("%",#{project},"%")
</if>
</select>
@@ -125,6 +129,12 @@
WHERE
sl.project LIKE CONCAT('%',#{project},'%')
</select>
+ <select id="getSysLaboratoryByName" resultMap="SysLaboratory">
+ select *
+ from sys_laboratory
+ where name = #{0}
+ and valid_flag = 1
+ </select>
<update id="updateLabExport" parameterType="com.nanometer.smartlab.entity.SysLaboratory">
update sys_laboratory set
type=#{type},
--
Gitblit v1.9.2