2022-12-16 关于楼栋楼层布局图分页bug修改。

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabBuildFloorLayoutServiceImpl.java

@@ -34,24 +34,18 @@ public class LabBuildFloorLayoutServiceImpl implements ILabBuildFloorLayoutServi
 
     @Override
     public List <LabBuildFloorLayoutVo> selectLabBuildFloorLayoutList(LabBuildFloorLayout labBuildFloorLayout) {
-        List<SysDictData> dictDatas = DictUtils.getDictCache("layout_room_type");
-        SysDictData sysDictData = new SysDictData();
-        sysDictData.setDictLabel("其他");
-        sysDictData.setDictValue("-99");
-        dictDatas.add(sysDictData);
-        Consumer<LabBuildFloorLayoutVo> consumer = c->Optional.ofNullable(dictDatas).orElseGet(Collections::emptyList)
-                .stream()
-                .filter(b->b.getDictValue().equals(c.getRoomType()+""))
-                .forEach(b->{
-                    c.setRoomTypeName(b.getDictLabel());
-                });
-        return Optional.ofNullable(labBuildFloorLayoutMapper.selectLabBuildFloorLayoutList(labBuildFloorLayout))
-                .orElseGet(Collections::emptyList)
-                .stream()
-                .map(a->{
-                    consumer.accept(a);
-                    return a;
-                }).collect(Collectors.toList());
+//        List<SysDictData> dictDatas = DictUtils.getDictCache("layout_room_type");
+//        SysDictData sysDictData = new SysDictData();
+//        sysDictData.setDictLabel("其他");
+//        sysDictData.setDictValue("-99");
+//        dictDatas.add(sysDictData);
+//        Consumer<LabBuildFloorLayoutVo> consumer = c->Optional.ofNullable(dictDatas).orElseGet(Collections::emptyList)
+//                .stream()
+//                .filter(b->b.getDictValue().equals(c.getRoomType()+""))
+//                .forEach(b->{
+//                    c.setRoomTypeName(b.getDictLabel());
+//                });
+        return labBuildFloorLayoutMapper.selectLabBuildFloorLayoutList(labBuildFloorLayout);
     }
 
     @Override

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

@@ -35,7 +35,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.id, t.build_id, t.floor_id, t.sub_id, t.room_num, t.room_name, t.room_type, t.point_name, t.user_id,
         (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 from lab_build_floor_layout as t
+        (select st.name from lab_subject st where st.id = t.sub_id) subName,
+        sd.dict_label roomTypeName
+        from lab_build_floor_layout as t
+        LEFT JOIN
+         (
+            SELECT sd.dict_label,sd.dict_value FROM sys_dict_data sd WHERE sd.dict_type='layout_room_type'
+            UNION ALL
+            SELECT '其他' dict_label,-99 dict_value FROM DUAL
+        ) sd ON sd.dict_value = t.room_type
     </sql>
 
     <select id="selectLabBuildFloorLayoutList" parameterType="com.zd.laboratory.domain.LabBuildFloorLayout" resultType="com.zd.laboratory.domain.vo.LabBuildFloorLayoutVo">