TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wayanrivan
2026-06-02 09:44:38 +07:00
parent 0b0de7ca1e
commit 4ba5b6a5c1
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/controllers/room_services.ts
View File

@ -178,11 +178,29 @@ export class RoomServicesController {
]) ])
.leftJoin("Service.serviceType", "serviceType") .leftJoin("Service.serviceType", "serviceType")
.leftJoin("Service.rooms", "room") .leftJoin("Service.rooms", "room")
.leftJoin("room.serviceclass", "roomClass")
.innerJoin("Service.servicefare", "serviceFare") .innerJoin("Service.servicefare", "serviceFare")
.innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") .innerJoin("serviceFare.serviceClass", "serviceClass")
.innerJoin("serviceFare.faretype", "fareType") .innerJoin("serviceFare.faretype", "fareType")
.andWhere("room.id = :roomId", { roomId }); .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_count = base_query.clone();
const res_list = base_query const res_list = base_query