From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug

---
 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
index 9480b33..b2323cf 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
@@ -13,6 +13,7 @@
     <result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>
     <result property="createTime" column="create_time"></result>
     <result property="updateTime" column="update_time"></result>
+    <result property="project" column="project"></result>
   </resultMap>
 
   <sql id="queryWhereSql">
@@ -41,11 +42,28 @@
     where id = #{id} and valid_flag = 1
   </select>
 
+  <select id="getSysLaboratorySimpleInfo" parameterType="java.lang.String"  resultMap="SysLaboratory">
+    select id,name from sys_laboratory
+    where id = #{id} and valid_flag = 1
+  </select>
+
   <select id="getSysLaboratoryList" parameterType="java.util.Map" resultMap="SysLaboratory">
     select su.* from sys_laboratory as su
     where su.valid_flag = 1
     <include refid="queryWhereSql"/>
     order by su.name ASC
+    <if test="first != null and pageSize != null">
+      limit #{first}, #{pageSize}
+    </if>
+  </select>
+
+  <select id="getSysLaboratorySimpleInfoList" parameterType="java.util.Map" resultMap="SysLaboratory">
+    select su.id,su.name,su.info_code,su.bar_code,su.location1,su.location2,su.project,su.create_time,su.update_time,bm1.meta_value as type,bm2.meta_value as department from sys_laboratory as su
+    left join base_meta as bm1 on bm1.id=su.type
+    left join base_meta as bm2 on bm2.id=su.department
+    where su.valid_flag = 1
+    <include refid="queryWhereSql"/>
+    order by su.create_time desc
     <if test="first != null and pageSize != null">
       limit #{first}, #{pageSize}
     </if>
@@ -135,6 +153,15 @@
     where name = #{0}
     and valid_flag = 1
   </select>
+  <select id="getPersonInCharge" resultType="java.util.Map">
+    select su.phone
+    from sys_user as su
+    left join base_role as br on su.role_id = br.id
+    where su.project like concat("%",#{project},"%")
+    and su.valid_flag = 1
+    and br.`name` = '实验负责人'
+
+  </select>
   <update id="updateLabExport" parameterType="com.nanometer.smartlab.entity.SysLaboratory">
     update sys_laboratory set
     type=#{type},

--
Gitblit v1.9.2