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-04-23 14:23:55 +07:00
parent 2b13632d8d
commit 9877b776c0
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/room.ts
View File

@ -183,8 +183,8 @@ export class RoomController {
room.location = param.location; room.location = param.location;
room.picture = param.picture; room.picture = param.picture;
room.floor = param.floor; room.floor = param.floor;
room.created_by = req.auth.data.name; room.created_by = req.auth?.data.name;
room.updated_by = req.auth.data.name; room.updated_by = req.auth?.data.name;
await queryRunner.manager.save(room); await queryRunner.manager.save(room);
await queryRunner.commitTransaction(); await queryRunner.commitTransaction();
@ -266,7 +266,7 @@ export class RoomController {
room.floor = param.floor; room.floor = param.floor;
room.location = param.location; room.location = param.location;
room.picture = param.picture; room.picture = param.picture;
room.updated_by = req.auth.data.name; room.updated_by = req.auth?.data.name;
await queryRunner.manager.save(room); await queryRunner.manager.save(room);
await queryRunner.commitTransaction(); await queryRunner.commitTransaction();
@ -299,13 +299,13 @@ export class RoomController {
if (!param.hard) { if (!param.hard) {
let room: Room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne()); let room: Room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne());
if (!room) throw { message: "Room " + Language.lang.failed_not_found }; if (!room) throw { message: "Room " + Language.lang.failed_not_found };
room.deleted_by = req.auth.data.name; room.deleted_by = req.auth?.data.name;
room.deleted_at = moment().toDate(); room.deleted_at = moment().toDate();
await OrmHelper.DB.manager.save(room); await OrmHelper.DB.manager.save(room);
affected = 1; affected = 1;
} else { } else {
const repo = OrmHelper.DB.getRepository(Room); const repo = OrmHelper.DB.getRepository(Room);
affected = (await repo.delete({ id: param.id })).affected; affected = (await repo.delete({ id: param.id })).affected ?? 0;
} }
if (affected > 0) { if (affected > 0) {
@ -332,7 +332,7 @@ export class RoomController {
}); });
const param: any = await schema.validateAsync(req.params); const param: any = await schema.validateAsync(req.params);
const repo = OrmHelper.DB.getRepository(Room); const repo = OrmHelper.DB.getRepository(Room);
const affected = (await repo.restore({ id: param.id })).affected; const affected = (await repo.restore({ id: param.id })).affected ?? 0;
if (affected > 0) { if (affected > 0) {
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {}); return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
} else { } else {

21
src/controllers/service_examination.ts
View File

@ -41,20 +41,20 @@ export class ServiceExaminationController {
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
var query = await ServiceModel.list(filter); // Clone terpisah untuk count dan list
const res_count = await ServiceModel.list(filter);
const res_list = await ServiceModel.list(filter);
const offset = (param.page - 1) * param.limit; const offset = (param.page - 1) * param.limit;
let limit = param.limit;
const res_count = query; res_list
const res_list = query
.leftJoinAndSelect("Service.serviceType", "serviceType") .leftJoinAndSelect("Service.serviceType", "serviceType")
.leftJoinAndSelect("Service.examination_details", "examinationDetails") .leftJoinAndSelect("Service.examination_details", "examinationDetails")
.leftJoinAndSelect("examinationDetails.measurement_unit", "measurementUnit") .leftJoinAndSelect("examinationDetails.measurement_unit", "measurementUnit")
.leftJoinAndSelect("examinationDetails.reference_range", "referenceRange") .leftJoinAndSelect("examinationDetails.reference_range", "referenceRange")
.orderBy("Service." + param.order_field, param.order_direction) .orderBy("Service." + param.order_field, param.order_direction as "ASC" | "DESC")
.offset(offset) .offset(offset)
.limit(limit); .limit(param.limit);
if (param.with_deleted) { if (param.with_deleted) {
res_count.withDeleted(); res_count.withDeleted();
@ -66,7 +66,14 @@ export class ServiceExaminationController {
const list_data = await res_list.getMany(); const list_data = await res_list.getMany();
const count_data = CommonHelper.countObject(list_data); const count_data = CommonHelper.countObject(list_data);
return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data); return ReturnHelper.successResponselist(
res, 200,
Language.lang.success_view,
count_data,
current_page,
total_count_data,
list_data
);
} catch (e: unknown) { } catch (e: unknown) {
log.error(e); log.error(e);
const err = e as Error; const err = e as Error;