2023-3-22 修改定时排风绑定实验室，添加一个字段显示位置。

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSubjectVO.java

@@ -115,6 +115,9 @@ public class LabSubjectVO extends LabSubject {
     @ApiModelProperty(name = "传感器危险源关联列表")
     private List<LabSensorHazardRelation> labSensorHazardRelations;
 
+    @ApiModelProperty(name = "位置")
+    private String posi;
+
     public String getSenseState() {
         return senseState;
     }
@@ -388,4 +391,12 @@ public class LabSubjectVO extends LabSubject {
     public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
+
+    public String getPosi() {
+        return posi;
+    }
+
+    public void setPosi(String posi) {
+        this.posi = posi;
+    }
 }

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

@@ -59,7 +59,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getLabExhaustNoJoinSub" parameterType="com.zd.laboratory.domain.vo.LabExhaustJoinSubVo" resultType="com.zd.laboratory.domain.vo.LabSubjectVO">
       select xx.* from (
       SELECT ls.*,sc.`classified_name` levelName,st.`type_name` typeName,
-        (SELECT COUNT(1) FROM lab_hardware h WHERE h.type=2 AND h.subject_id = ls.`id`) hdcount
+        (SELECT COUNT(1) FROM lab_hardware h WHERE h.type=2 AND h.subject_id = ls.`id`) hdcount,
+        CONCAT((SELECT st.name FROM lab_subject st WHERE st.id = ls.id), '-', (SELECT dt.dept_name
+        FROM sys_dept dt,
+        lab_subject st
+        WHERE dt.dept_id = st.build_id
+        AND st.id = ls.id),
+        '-', (SELECT bg.name
+        FROM lab_building bg,
+        lab_subject st
+        WHERE bg.id = st.floor_id
+        AND st.id = ls.id),
+        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 = ls.id)),'')) posi
+
         FROM lab_subject ls LEFT JOIN lab_safe_classified sc ON ls.level = sc.`id`
         LEFT JOIN lab_safe_classtype st ON ls.type_id = st.`id`
         <where>