大屏统计修改

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

@@ -49,6 +49,16 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     }
 
     /**
+     * 查询楼栋(楼层)列表-无分页
+     */
+    @GetMapping("/getlist")
+    @ApiOperation(value = "查询楼栋(楼层)列表")
+    public TableDataInfo <LabBuildFloor> getList(LabBuildFloor labBuildFloor) {
+        List <LabBuildFloor> list = labBuildFloorService.selectLabBuildFloorList(labBuildFloor);
+        return getDataTable(list);
+    }
+
+    /**
      * 新增楼栋(楼层)
      */
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_BUILDFLOOR + PerFun.ADD)

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

@@ -241,6 +241,16 @@ public class LabSubjectController extends BaseController {
         return ResultData.success();
     }
 
+    /**
+     * 修改实验室排序
+     */
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SUBJECT + PerFun.EDIT)
+    @Log(title = "实验室", businessType = BusinessType.UPDATE)
+    @PostMapping("/editSort")
+    public ResultData editSort(@RequestBody LabSubject labSubject) {
+        return ResultData.success();
+    }
+
 
     /**
      * 修改实验室

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

@@ -263,8 +263,8 @@
                (select i.id from xxp_card_info i where i.subJect_id=t.id LIMIT 1)         xxpCardInfoId,
                CONCAT(su.nick_name, '@', su.phonenumber)                      AS          adminNameAndPhone,
 
-               (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 b.name from lab_build_floor b where b.id = t.build_id)          buildName,
+               (select b.name from lab_build_floor b where b.id = t.floor_id)                floorName,
                (SELECT l.room_num FROM lab_build_floor_layout l WHERE l.sub_id = t.id)         roomName
 
         from lab_subject t
@@ -459,9 +459,9 @@
         t.sign_time,
         CONCAT(su.nick_name,'@',su.phonenumber) AS adminNameAndPhone,
 
-        (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 b.name from lab_build_floor b where b.id = t.build_id) buildName,
+        (select b.name from lab_build_floor b where b.id = t.floor_id) floorName,
+        (SELECT l.room_num FROM lab_build_floor_layout l WHERE l.id = t.layout_id ) roomName,
         t.inspect_check_in,
         t.inspect_skipped,
         t.inspect_check_count,
@@ -794,7 +794,7 @@
         INNER JOIN lab_safe_classified sc ON sc.id = s.level
         INNER JOIN lab_safe_classtype st ON st.id = s.type_id
         INNER JOIN sys_user u ON u.user_id = s.`admin_id`
-        INNER JOIN lab_building lb on s.floor_id = lb.id
+        INNER JOIN lab_build_floor lb on s.floor_id = lb.id
         INNER JOIN sys_dept d2 ON s.build_id = d2.`dept_id`
         <where>
             <if test="floorId != null ">
@@ -842,7 +842,7 @@
         INNER JOIN lab_safe_classified sc ON sc.id = s.level
         INNER JOIN lab_safe_classtype st ON st.id = s.type_id
         INNER JOIN sys_user u ON u.user_id = s.`admin_id`
-        INNER JOIN lab_building lb on s.floor_id = lb.id
+        INNER JOIN lab_build_floor lb on s.floor_id = lb.id
         INNER JOIN sys_dept d2 ON s.build_id = d2.`dept_id`
         inner join lab_risk_planjoinsub rpb on s.`id` = rpb.`subject_id`
         inner join lab_risk_plan rp on rp.`id` = rpb.`risk_plan_id`
@@ -890,7 +890,7 @@
         LEFT JOIN lab_safe_classified sc ON sc.id = s.level
         LEFT JOIN lab_safe_classtype st ON st.id = s.type_id
         LEFT JOIN sys_user u ON u.user_id = s.`admin_id`
-        LEFT JOIN lab_building lb ON s.floor_id = lb.id
+        LEFT JOIN lab_build_floor lb ON s.floor_id = lb.id
         LEFT JOIN sys_dept d2 ON s.build_id = d2.`dept_id`
         <if test="whiteUserId != null ">
             LEFT JOIN lab_white_join_sublist ws ON s.`id` = ws.`subject_id`