From 05f71eff9a356615db7629e8a439d451dfab60f7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 02 Feb 2021 08:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
index a375e93..a557fe8 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
@@ -31,6 +31,9 @@
<if test="department != null and department != ''">
and su.department = #{department}
</if>
+ <if test="project != null and project != ''">
+ and su.project like concat("%",#{project},"%")
+ </if>
</sql>
<select id="getSysLaboratory" parameterType="java.lang.String" resultMap="SysLaboratory" >
@@ -84,13 +87,13 @@
</select>
<insert id="insertSysLaboratory" parameterType="com.nanometer.smartlab.entity.SysLaboratory">
- insert into sys_laboratory(id, type, name, info_code, bar_code, location1, location2, valid_flag,department, create_time, update_time)
- values (#{id}, #{type}, #{name}, #{infoCode}, #{barCode}, #{location1}, #{location2}, 1,#{department}, now(), now())
+ insert into sys_laboratory(id, type, name, info_code, bar_code, location1, location2, valid_flag,department, create_time, update_time,project)
+ values (#{id}, #{type}, #{name}, #{infoCode}, #{barCode}, #{location1}, #{location2}, 1,#{department}, now(), now(),#{project})
</insert>
<update id="updateSysLaboratory" parameterType="com.nanometer.smartlab.entity.SysLaboratory">
update sys_laboratory set type=#{type}, name=#{name}, info_code=#{infoCode}, bar_code=#{barCode}, location1=#{location1}, location2=#{location2},department=#{department},
- update_time=now()
+ update_time=now(),project = #{project}
where id=#{id}
</update>
@@ -112,7 +115,16 @@
where bar_code = #{barCode}
and valid_flag=1
</select>
-
+ <select id="getLaboratoryByProject" resultType="com.nanometer.smartlab.entity.dto.LaboratoryVo$Laboratory">
+ SELECT
+ CONCAT('楼号：',sl.location1,'-地址号：',sl.location2) as address,
+ bm.meta_value as department
+ FROM
+ sys_laboratory as sl
+ LEFT JOIN base_meta bm on bm.id = sl.department
+ WHERE
+ sl.project LIKE CONCAT('%',#{project},'%')
+ </select>
<update id="updateLabExport" parameterType="com.nanometer.smartlab.entity.SysLaboratory">
update sys_laboratory set
type=#{type},
--
Gitblit v1.9.2