2023-2-10 修改老的布局图替换成新布局图

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

@@ -41,13 +41,13 @@
         h.name as hardName,
         s.name as subName,
         d.dept_name,
-        CONCAT(d.dept_name, '-', bg.name, '-', slt.room) posi
+        CONCAT(d.dept_name, '-', bg.name, '-', slt.room_num) posi
         from lab_haikang_user_log ul left join sys_user u on ul.join_user_id = u.user_id
              left join lab_hardware h on ul.hard_id = h.id
              left join lab_subject s on h.subject_id = s.id
              left join sys_dept d on s.dept_id = d.dept_id
              left join lab_building bg on bg.id = s.floor_id
-             left join lab_subject_layout slt on slt.id = s.layout_id
+             LEFT JOIN lab_build_floor_layout slt ON slt.sub_id = s.id
         <where>
             <if test="searchValue != null  and searchValue != ''">
             and (

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

@@ -205,7 +205,7 @@
                 s.id as subId,
                 s.name as subName,
                 CONCAT(
-                    dt.dept_name, '-', bg.name, '-', slt.room
+                    dt.dept_name, '-', bg.name, '-', slt.room_num
                 ) posi,
                 dt1.dept_name as deptName,
                 (select count(id) from lab_haikang_user where hard_id = har.id) as available,
@@ -215,7 +215,7 @@
                 lab_hardware har inner join lab_subject s on har.subject_id = s.id
                 left join sys_dept dt on dt.dept_id = s.build_id
                 left join lab_building bg on bg.id = s.floor_id
-                left join lab_subject_layout slt on slt.id = s.layout_id
+                left join lab_build_floor_layout slt on slt.sub_id = s.id
                 left join sys_dept dt1 on dt1.dept_id = s.dept_id
             where
                 har.type = #{type}

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

@@ -100,11 +100,7 @@
                                        lab_subject st
                                   WHERE bg.id = st.floor_id
                                     AND st.id = he.subject_id),
-                            '-', (SELECT slt.room
-                                  FROM lab_subject_layout slt,
-                                       lab_subject st
-                                  WHERE slt.id = st.layout_id
-                                    AND st.id = he.subject_id))                    posi,
+                            IFNULL(CONCAT('-',(SELECT slt.room_num room FROM lab_build_floor_layout slt,lab_subject st WHERE slt.sub_id = st.id AND st.id = he.subject_id)),'')) posi,
                      stc.ring_time,
                      stc.deal_time,
                      he.operate_time,

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

@@ -234,7 +234,7 @@
 
                (select d.dept_name from sys_dept d where t.build_id = d.dept_id)          buildName,
                (select b.name from lab_building b where b.id = t.floor_id)                floorName,
-               (SELECT l.room FROM lab_subject_layout l WHERE l.id = t.layout_id)         roomName
+               (SELECT l.room_num FROM lab_build_floor_layout l WHERE l.sub_id = t.id)         roomName
 
         from lab_subject t
                  left join sys_user su on su.user_id = t.admin_id AND su.`del_flag` = 0