Merge commit '5cb64b1583118dea3748f1d2d412b274252f8ad5' into pro

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

@@ -164,4 +164,14 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     public ResultData getBuildOrFloorDetailList(LabBuildFloorVo labBuildFloorVo) {
         return ResultData.success(labBuildFloorService.getBuildOrFloorDetailList(labBuildFloorVo));
     }
+
+
+    /**
+     * 查询楼栋(楼层)tree结构列表（没权限的）
+     */
+    @GetMapping("/getNoAuthTreeList")
+    @ApiOperation(value = "查询楼栋(楼层)列表")
+    public ResultData <List<LabBuildFloorVo>> getNoAuthTreeList(LabBuildFloor labBuildFloor) {
+        return ResultData.success(labBuildFloorService.getTreeList(labBuildFloor));
+    }
 }

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

@@ -99,4 +99,14 @@ public class LabBuildFloorLayoutController extends BaseController<LabBuildFloorL
         return ResultData.success(labBuildFloorLayoutService.getLotStatis(labBuildFloorLayout));
     }
 
+    /**
+     * 查询布局图列表（不要权限）
+     */
+    @GetMapping("/getNoAuthList")
+    @ApiOperation(value = "查询布局图列表")
+    public TableDataInfo <LabBuildFloorLayout> getNoAuthList(LabBuildFloorLayout labBuildFloorLayout) {
+        startPage();
+        List <LabBuildFloorLayoutVo> list = labBuildFloorLayoutService.selectLabBuildFloorLayoutList(labBuildFloorLayout);
+        return getDataTable(list);
+    }
 }

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

@@ -45,4 +45,12 @@ public class LabBuildFloorLayoutVo extends LabBuildFloorLayout {
     /** 是否是登录人的实验室 */
     @ApiModelProperty(value = "是否是登录人的实验室")
     private boolean loginAdmin;
+
+    /** 分级id */
+    @ApiModelProperty(value = "分级id")
+    private String classifiedId;
+
+    /** 分类id */
+    @ApiModelProperty(value = "分类id")
+    private String typeId;
 }

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

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT su.nick_name FROM sys_user su WHERE su.user_id = t.`user_id`) create_by,
         t.create_time, t.update_by, t.update_time, t.remark,
         (select st.name from lab_subject st where st.id = t.sub_id) subName,
-        sd.dict_label roomTypeName
+        sd.dict_label roomTypeName,sc.`id` classifiedId,st.id typeId
         from lab_build_floor_layout as t
         LEFT JOIN
          (
@@ -46,6 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             UNION ALL
             SELECT '其他' dict_label,-99 dict_value FROM DUAL
         ) sd ON sd.dict_value = t.room_type
+        LEFT JOIN lab_subject sb ON t.`sub_id` = sb.`id`
+        LEFT JOIN lab_safe_classified sc ON sb.level = sc.`id`
+        LEFT JOIN lab_safe_classtype st ON sb.type_id = st.`id`
     </sql>
 
     <select id="selectLabBuildFloorLayoutList" parameterType="com.zd.laboratory.domain.LabBuildFloorLayout" resultType="com.zd.laboratory.domain.vo.LabBuildFloorLayoutVo">