2022-12-13 疏散硬件相关楼栋楼层，替换到新的楼栋楼层表

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabBuildFloorController.java

@@ -129,4 +129,13 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     public ResultData getBuildOrFloorList(LabBuildFloorVo labBuildFloorVo) {
         return ResultData.success(labBuildFloorService.getBuildOrFloorList(labBuildFloorVo));
     }
+
+    /**
+     * 查询楼栋(楼层)列表
+     */
+    @GetMapping("/selBuildOrFloorList")
+    @ApiOperation(value = "查询楼栋(楼层)列表")
+    public ResultData selBuildOrFloorList(LabBuildFloor labBuildFloor) {
+        return ResultData.success(labBuildFloorService.selectLabBuildFloorList(labBuildFloor));
+    }
 }

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

@@ -53,7 +53,38 @@
         from lab_sparse_hardware
     </sql>
     <sql id="selectLabSparseHardwareListVo">
-        select t.id,
+        SELECT t.id,
+        t.hardware_num,
+        t.name,
+        t.type,
+        t.floor_id,
+        t.build_id,
+        CASE WHEN t.subject_id IS NOT NULL THEN
+        (SELECT DISTINCT bf.name FROM lab_build_floor bf INNER JOIN lab_build_floor_layout bfl ON bf.id = bfl.build_id WHERE bfl.sub_id = t.subject_id)
+        ELSE d.name END AS buildName,
+        t.subject_id,
+        s.name AS subjectName,
+        t.operate,
+        t.function_status,
+        t.dept_id,
+        t.dept_name,
+        t.create_time,
+        t.user_id,
+        t.create_by,
+        t.update_time,
+        t.update_by,
+        t.remark,
+        t.port,
+        t.device_vol,
+        t.device_type,
+        CASE WHEN t.subject_id IS NOT NULL THEN
+        (SELECT DISTINCT bf.name FROM lab_build_floor bf INNER JOIN lab_build_floor_layout bfl ON bf.id = bfl.floor_id WHERE bfl.sub_id = t.subject_id)
+        ELSE b.name END AS floorName
+        FROM lab_sparse_hardware AS t
+        LEFT JOIN lab_build_floor d ON t.build_id = d.id
+        LEFT JOIN lab_build_floor b ON t.floor_id = b.id
+        LEFT JOIN lab_subject s ON t.subject_id = s.id
+        <!--select t.id,
                t.hardware_num,
                t.name,
                t.type,
@@ -84,6 +115,7 @@
             left join sys_dept d on t.build_id = d.dept_id
             left join lab_building b on t.floor_id = b.id
             left join lab_subject s on t.subject_id = s.id
+            -->
     </sql>
     <select id="selectLabSparseHardwareList" parameterType="com.zd.laboratory.domain.LabSparseHardware"
             resultMap="LabSparseHardwareResult">
@@ -111,14 +143,14 @@
     </select>
 
     <select id="selectListByFloorId" resultType="java.util.Map">
-        SELECT t.hardware_num as hardwareNum,t.`name`,t.operate,t.port,t.device_vol as deviceVol FROM lab_sparse_hardware t LEFT JOIN sys_dept d ON t.floor_id = d.dept_id
+        SELECT t.hardware_num as hardwareNum,t.`name`,t.operate,t.port,t.device_vol as deviceVol FROM lab_sparse_hardware t LEFT JOIN lab_build_floor d ON t.floor_id = d.id
         WHERE t.floor_id=#{floorId} AND t.`type`=#{type}
         <if test="subId != null">
             or (subject_id = #{subId} and device_type = 2)
         </if>
     </select>
     <select id="selectCameraByFloorId" resultType="java.lang.String">
-       SELECT  t.hardware_num FROM  lab_sparse_hardware t LEFT JOIN sys_dept d ON t.floor_id = d.dept_id
+       SELECT  t.hardware_num FROM  lab_sparse_hardware t LEFT JOIN lab_build_floor d ON t.floor_id = d.id
        WHERE t.floor_id=#{floorId} AND t.`type`=1
     </select>