2022-1-3 修改小程序疏散的时候，调用实验室查询列表和详情接口修改，主要变动的是把旧的楼栋楼层换成新的楼栋楼层表。

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectLayoutMapper.xml

@@ -175,15 +175,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectAddrrByLayoutIds"  resultType="com.zd.laboratory.api.entity.SubAddrr">
-        select t.id,  t.room, t.floor_id,
-               lb.name as floor_name ,
-               sd.dept_name as build_name
-        from lab_subject_layout as t
-        left join lab_building lb on lb.id = t.floor_id
-        left join sys_dept sd on sd.dept_id = lb.dept_id
+        <!--select t.id,  t.room, t.floor_id,-->
+               <!--lb.name as floor_name ,-->
+               <!--sd.dept_name as build_name-->
+        <!--from lab_subject_layout as t-->
+        <!--left join lab_building lb on lb.id = t.floor_id-->
+        <!--left join sys_dept sd on sd.dept_id = lb.dept_id-->
+        <!--where t.id in-->
+        <!--<foreach item="id" collection="array" open="(" separator="," close=")">-->
+            <!--#{id}-->
+        <!--</foreach>-->
+        SELECT t.id,  t.room_num room, t.`floor_id`,
+        (SELECT bf.`name` FROM lab_build_floor bf WHERE bf.id = t.`floor_id`) AS floor_name ,
+        (SELECT bf.`name` FROM lab_build_floor bf WHERE bf.type = 2 AND bf.id = t.`build_id` ) AS build_name
+        FROM lab_build_floor_layout AS t
         where t.id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
+        #{id}
         </foreach>
     </select>
     <select id="selectLayoutListByIds" resultType="com.zd.laboratory.domain.vo.LabSubjectLayoutVo">

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -136,7 +136,7 @@
     <sql id="selectLabSubjectListVo">
         select t.id,
                t.name,
-               t.floor_id,
+               bfl.floor_id,
                lb.room,
                t.dept_id,
                IFNULL(su.user_id,-1) admin_id,
@@ -147,7 +147,7 @@
                t.update_time,
                t.update_by,
                t.sub_dept,
-               t.layout_id,
+               bfl.id layout_id,
                t.build_id,
                t.remark,
                t.level,
@@ -178,11 +178,12 @@
         left  join  sys_dept sd on sd.dept_id = t.dept_id
         left  join  lab_subject_layout lb on lb.id = t.layout_id
         left join lab_safe_classified cf on cf.id = t.level
+        LEFT JOIN lab_build_floor_layout bfl ON t.`id` = bfl.`sub_id`
     </sql>
     <sql id="selectLabSubjectListVoIFPhone">
         select t.id,
                t.name,
-               t.floor_id,
+               bfl.floor_id,
                t.room,
                t.dept_id,
                t.admin_id,
@@ -193,7 +194,7 @@
                t.update_time,
                t.update_by,
                t.sub_dept,
-               t.layout_id,
+               bfl.id layout_id,
                t.build_id,
                t.check_out,
                t.check_in,
@@ -215,6 +216,7 @@
                  left  join  sys_user su on su.user_id = t.admin_id
                  left  join  sys_dept sd on sd.dept_id = t.dept_id
                  left  join  lab_subject_layout lb on lb.id = t.layout_id
+                 LEFT JOIN lab_build_floor_layout bfl ON t.`id` = bfl.`sub_id`
     </sql>
     <select id="selectLabSubjectList" parameterType="com.zd.laboratory.domain.LabSubject" resultMap="LabSubjectResult">
         <include refid="selectLabSubjectVo"/>