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-05-15 09:35:53 +07:00
parent b0335a0ce1
commit f10677b4d0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/controllers/service_fare.ts
View File

@ -60,16 +60,20 @@ export class ServiceFareController {
.select('sf."serviceId"', "serviceId") .select('sf."serviceId"', "serviceId")
.addSelect("COALESCE(MIN(sf.fare), 0)", "min") .addSelect("COALESCE(MIN(sf.fare), 0)", "min")
.addSelect("COALESCE(MAX(sf.fare), 0)", "max") .addSelect("COALESCE(MAX(sf.fare), 0)", "max")
.addSelect("st.name", "service_type_name")
.from("service_fares", "sf") .from("service_fares", "sf")
.innerJoin("fare_type", "ft", 'sf."faretypeId" = ft.id AND ft.deleted_at IS NULL') .innerJoin("fare_type", "ft", 'sf."faretypeId" = ft.id AND ft.deleted_at IS NULL')
.innerJoin("service_classes", "sc", 'sf."serviceClassId" = sc.id AND sc.deleted_at IS NULL') .innerJoin("service_classes", "sc", 'sf."serviceClassId" = sc.id AND sc.deleted_at IS NULL')
.groupBy('sf."serviceId"'); .innerJoin("services", "s", 'sf."serviceId" = s.id AND s.deleted_at IS NULL')
.innerJoin("service_types", "st", 's."serviceTypeId" = st.id AND st.deleted_at IS NULL') // ← fix di sini
.groupBy('sf."serviceId", st.name');
}, },
"sfa", "sfa",
'sfa."serviceId" = Service.id' 'sfa."serviceId" = Service.id'
) )
.addSelect('COALESCE(sfa.min, 0)', "min_fare") .addSelect('COALESCE(sfa.min, 0)', "min_fare")
.addSelect('COALESCE(sfa.max, 0)', "max_fare") .addSelect('COALESCE(sfa.max, 0)', "max_fare")
.addSelect('sfa.service_type_name', "service_type_name")
.orderBy("Service." + param.order_field, param.order_direction) .orderBy("Service." + param.order_field, param.order_direction)
.skip(offset) .skip(offset)
.take(limit); .take(limit);
@ -87,6 +91,7 @@ export class ServiceFareController {
...entity, ...entity,
min_fare: list_data.raw[index]?.min_fare ?? null, min_fare: list_data.raw[index]?.min_fare ?? null,
max_fare: list_data.raw[index]?.max_fare ?? null, max_fare: list_data.raw[index]?.max_fare ?? null,
service_type_name: list_data.raw[index]?.service_type_name ?? null,
})); }));
const count_data = CommonHelper.countObject(merged); const count_data = CommonHelper.countObject(merged);