/room/roomBedCheckRecord/echo 拼接寝室名

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedCheckRecordServiceImpl.java

@@ -203,7 +203,7 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
             MPJLambdaWrapper<Room> queryRoomByClass = new MPJLambdaWrapper<>();
             queryRoomByClass
                     .selectAs(Room::getId, RoomEchoVo::getRoomId)
-                    .selectAs(Room::getRoomName, RoomEchoVo::getRoomName)
+                    .select("CONCAT(t2.name,\"-\" , t3.name, t.room_name) as roomName")
                     .leftJoin(RoomBed.class, RoomBed::getRoomId, Room::getId)
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, RoomBed::getStudentUserId)
                     .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, Room::getOfficeBuildId)
@@ -216,9 +216,12 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
         MPJLambdaWrapper<Room> queryRoomByTeacherAppoint = new MPJLambdaWrapper<>();
         queryRoomByTeacherAppoint
                 .selectAs(Room::getId, RoomEchoVo::getRoomId)
-                .selectAs(Room::getRoomName, RoomEchoVo::getRoomName)
+                .select("CONCAT(t2.name,\"-\" , t3.name, t.room_name) as roomName")
                 .leftJoin(RoomTeacherAppoint.class, RoomTeacherAppoint::getRoomId, Room::getId)
-                .eq(RoomTeacherAppoint::getUserId, StpUtil.getLoginIdAsLong());
+                .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, Room::getOfficeBuildId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Room::getGender)
+                .eq(RoomTeacherAppoint::getUserId, StpUtil.getLoginIdAsLong())
+                .disableSubLogicDel();
         List<RoomEchoVo> roomEchoVoByTeacherAppointList = roomMapper.selectJoinList(RoomEchoVo.class, queryRoomByTeacherAppoint);
 
         List<RoomEchoVo> roomEchoVoList = new ArrayList<>();