diff --git a/src/controllers/room_services.ts b/src/controllers/room_services.ts index 5ae0f00..81b0940 100644 --- a/src/controllers/room_services.ts +++ b/src/controllers/room_services.ts @@ -178,11 +178,29 @@ export class RoomServicesController { ]) .leftJoin("Service.serviceType", "serviceType") .leftJoin("Service.rooms", "room") - .leftJoin("room.serviceclass", "roomClass") .innerJoin("Service.servicefare", "serviceFare") - .innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") + .innerJoin("serviceFare.serviceClass", "serviceClass") .innerJoin("serviceFare.faretype", "fareType") .andWhere("room.id = :roomId", { roomId }); + // .select([ + // "Service.id", + // "Service.name", + // "Service.created_at", + // "Service.created_by", + // "serviceType.id", + // "serviceType.name", + // "serviceFare.id", + // "serviceFare.fare", + // "fareType.id", + // "fareType.name", + // ]) + // .leftJoin("Service.serviceType", "serviceType") + // .leftJoin("Service.rooms", "room") + // .leftJoin("room.serviceclass", "roomClass") + // .innerJoin("Service.servicefare", "serviceFare") + // .innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") + // .innerJoin("serviceFare.faretype", "fareType") + // .andWhere("room.id = :roomId", { roomId }); const res_count = base_query.clone(); const res_list = base_query