From 65e3740cc26835c2652261586b52f6fe34890e2a Mon Sep 17 00:00:00 2001 From: harid Date: Thu, 12 Feb 2026 11:47:53 +0700 Subject: [PATCH] Migration add fields isDeleted #210 --- src/controllers/CommandController.ts | 4 +- src/controllers/ImportDataController.ts | 14 ++-- .../OrganizationDotnetController.ts | 12 +-- .../OrganizationUnauthorizeController.ts | 6 +- src/controllers/PosMasterActController.ts | 1 + src/controllers/ProfileAbilityController.ts | 4 +- .../ProfileAbilityEmployeeController.ts | 4 +- .../ProfileAbilityEmployeeTempController.ts | 4 +- .../ProfileAssessmentsController.ts | 4 +- .../ProfileAssessmentsEmployeeController.ts | 3 +- ...rofileAssessmentsEmployeeTempController.ts | 3 +- .../ProfileAssistanceController.ts | 4 +- .../ProfileAssistanceEmployeeController.ts | 4 +- ...ProfileAssistanceEmployeeTempController.ts | 4 +- .../ProfileCertificateController.ts | 4 +- .../ProfileCertificateEmployeeController.ts | 4 +- ...rofileCertificateEmployeeTempController.ts | 4 +- .../ProfileChangeNameController.ts | 4 +- .../ProfileChangeNameEmployeeController.ts | 4 +- ...ProfileChangeNameEmployeeTempController.ts | 4 +- src/controllers/ProfileChildrenController.ts | 4 +- .../ProfileChildrenEmployeeController.ts | 4 +- .../ProfileChildrenEmployeeTempController.ts | 4 +- src/controllers/ProfileController.ts | 62 +++++++++------- .../ProfileDisciplineController.ts | 6 +- .../ProfileDisciplineEmployeeController.ts | 6 +- ...ProfileDisciplineEmployeeTempController.ts | 6 +- src/controllers/ProfileDutyController.ts | 4 +- .../ProfileDutyEmployeeController.ts | 4 +- .../ProfileDutyEmployeeTempController.ts | 4 +- .../ProfileEducationsController.ts | 4 +- .../ProfileEducationsEmployeeController.ts | 4 +- ...ProfileEducationsEmployeeTempController.ts | 4 +- src/controllers/ProfileEmployeeController.ts | 62 +++++++++------- .../ProfileEmployeeTempController.ts | 20 ++--- src/controllers/ProfileHonorController.ts | 4 +- .../ProfileHonorEmployeeController.ts | 4 +- .../ProfileHonorEmployeeTempController.ts | 4 +- src/controllers/ProfileInsigniaController.ts | 4 +- .../ProfileInsigniaEmployeeController.ts | 4 +- .../ProfileInsigniaEmployeeTempController.ts | 4 +- src/controllers/ProfileLeaveController.ts | 5 +- .../ProfileLeaveEmployeeController.ts | 6 +- .../ProfileLeaveEmployeeTempController.ts | 6 +- src/controllers/ProfileNopaidController.ts | 4 +- .../ProfileNopaidEmployeeController.ts | 4 +- .../ProfileNopaidEmployeeTempController.ts | 4 +- src/controllers/ProfileOtherController.ts | 4 +- .../ProfileOtherEmployeeController.ts | 4 +- .../ProfileOtherEmployeeTempController.ts | 4 +- src/controllers/ReportController.ts | 30 +++++--- src/entities/ProfileAbility.ts | 7 ++ src/entities/ProfileAbilityHistory.ts | 7 ++ src/entities/ProfileAssessment.ts | 7 ++ src/entities/ProfileAssessmentHistory.ts | 7 ++ src/entities/ProfileAssistance.ts | 7 ++ src/entities/ProfileAssistanceHistory.ts | 7 ++ src/entities/ProfileCertificate.ts | 7 ++ src/entities/ProfileCertificateHistory.ts | 7 ++ src/entities/ProfileChangeName.ts | 7 ++ src/entities/ProfileChangeNameHistory.ts | 7 ++ src/entities/ProfileChildren.ts | 7 ++ src/entities/ProfileChildrenHistory.ts | 7 ++ src/entities/ProfileDiscipline.ts | 7 ++ src/entities/ProfileDisciplineHistory.ts | 7 ++ src/entities/ProfileDuty.ts | 7 ++ src/entities/ProfileDutyHistory.ts | 7 ++ src/entities/ProfileEducation.ts | 7 ++ src/entities/ProfileEducationHistory.ts | 7 ++ src/entities/ProfileHonor.ts | 7 ++ src/entities/ProfileHonorHistory.ts | 7 ++ src/entities/ProfileInsignia.ts | 7 ++ src/entities/ProfileInsigniaHistory.ts | 7 ++ src/entities/ProfileLeave.ts | 14 ++++ src/entities/ProfileNopaid.ts | 7 ++ src/entities/ProfileNopaidHistory.ts | 7 ++ src/entities/ProfileOther.ts | 7 ++ src/entities/ProfileOtherHistory.ts | 7 ++ src/entities/ProfileSalary.ts | 7 ++ src/entities/ProfileSalaryBackup.ts | 7 ++ src/entities/ProfileSalaryHistory.ts | 7 ++ .../1770870836370-add_fields_isDeleted.ts | 74 +++++++++++++++++++ 82 files changed, 499 insertions(+), 180 deletions(-) create mode 100644 src/migration/1770870836370-add_fields_isDeleted.ts diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 5c801315..ece19088 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -6679,7 +6679,7 @@ export class CommandController extends Controller { profileEdu.profileId = profile.id; const educationLevel = await this.profileEducationRepo.findOne({ select: ["id", "level", "profileId"], - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { level: "DESC" }, }); profileEdu.level = educationLevel == null ? 1 : educationLevel.level + 1; @@ -6871,7 +6871,7 @@ export class CommandController extends Controller { // Insignia if (_oldInsigniaIds.length > 0) { const _insignias = await this.insigniaRepo.find({ - where: { id: In(_oldInsigniaIds) }, + where: { id: In(_oldInsigniaIds), isDeleted: false }, order: { createdAt: "ASC" }, }); for (const oldInsignia of _insignias) { diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts index 99e931ea..1c71f9b0 100644 --- a/src/controllers/ImportDataController.ts +++ b/src/controllers/ImportDataController.ts @@ -2475,8 +2475,8 @@ export class ImportDataController extends Controller { }); const educationLevel = await this.profileEducationRepo.findOne({ - select: ["id", "level", "profileId"], - where: { profileId: _item.id }, + select: ["id", "level", "profileId", "isDeleted"], + where: { profileId: _item.id, isDeleted: false }, order: { level: "DESC" }, }); @@ -2607,8 +2607,8 @@ export class ImportDataController extends Controller { }); const educationLevel = await this.profileEducationRepo.findOne({ - select: ["id", "level", "profileEmployeeId"], - where: { profileEmployeeId: _item.id }, + select: ["id", "level", "profileEmployeeId", "isDeleted"], + where: { profileEmployeeId: _item.id, isDeleted: false }, order: { level: "DESC" }, }); @@ -2740,8 +2740,8 @@ export class ImportDataController extends Controller { }); const educationLevel = await this.profileEducationRepo.findOne({ - select: ["id", "level", "profileEmployeeId"], - where: { profileEmployeeId: _item.id }, + select: ["id", "level", "profileEmployeeId", "isDeleted"], + where: { profileEmployeeId: _item.id, isDeleted: false }, order: { level: "DESC" }, }); @@ -5799,7 +5799,7 @@ export class ImportDataController extends Controller { }, }); const eduLevel = await this.profileEducationRepo.findOne({ - where: { profileId: _item.id }, + where: { profileId: _item.id, isDeleted: false }, order: { startDate: "DESC", }, diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index 16566685..8f5dd6ac 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -1359,7 +1359,7 @@ export class OrganizationDotnetController extends Controller { order: { commandDateAffect: "DESC" }, }), this.insigniaRepo.findOne({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { receiveDate: "DESC" }, }), ]); @@ -1542,7 +1542,7 @@ export class OrganizationDotnetController extends Controller { order: { commandDateAffect: "DESC" }, }), this.insigniaRepo.findOne({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { receiveDate: "DESC" }, }), ]); @@ -2379,7 +2379,7 @@ export class OrganizationDotnetController extends Controller { order: { commandDateAffect: "DESC" }, }), this.insigniaRepo.findOne({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { receiveDate: "DESC" }, }), ]); @@ -2694,7 +2694,7 @@ export class OrganizationDotnetController extends Controller { order: { commandDateAffect: "DESC" }, }), this.insigniaRepo.findOne({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { receiveDate: "DESC" }, }), ]); @@ -7441,7 +7441,7 @@ export class OrganizationDotnetController extends Controller { : []; const profileEducations = await this.educationRepo.find({ - where: { profileEmployeeId: profile!.id }, + where: { profileEmployeeId: profile!.id, isDeleted: false }, order: { level: "ASC" }, }); _educations = profileEducations.length > 0 @@ -7581,7 +7581,7 @@ export class OrganizationDotnetController extends Controller { : []; const profileEducations = await this.educationRepo.find({ - where: { profileId: profile!.id }, + where: { profileId: profile!.id, isDeleted: false }, order: { level: "ASC" }, }); _educations = profileEducations.length > 0 diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts index d2ec617d..deaa1f35 100644 --- a/src/controllers/OrganizationUnauthorizeController.ts +++ b/src/controllers/OrganizationUnauthorizeController.ts @@ -423,6 +423,7 @@ export class OrganizationUnauthorizeController extends Controller { year: body.year.toString(), pointSum: MoreThanOrEqual(90), period: body.period.toLocaleUpperCase(), + isDeleted: false } } ); @@ -884,6 +885,7 @@ export class OrganizationUnauthorizeController extends Controller { year: body.year.toString(), pointSum: MoreThanOrEqual(90), period: body.period.toLocaleUpperCase(), + isDeleted: false } } ); @@ -1088,7 +1090,7 @@ export class OrganizationUnauthorizeController extends Controller { order: { commandDateAffect: "DESC" }, }), this.insigniaRepo.findOne({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { receiveDate: "DESC" }, }), ]); @@ -1403,7 +1405,7 @@ export class OrganizationUnauthorizeController extends Controller { order: { commandDateAffect: "DESC" }, }), this.insigniaRepo.findOne({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { receiveDate: "DESC" }, }), ]); diff --git a/src/controllers/PosMasterActController.ts b/src/controllers/PosMasterActController.ts index 7c63ede5..81a61bf4 100644 --- a/src/controllers/PosMasterActController.ts +++ b/src/controllers/PosMasterActController.ts @@ -598,6 +598,7 @@ export class PosMasterActController extends Controller { "lastUpdateFullName", "lastUpdatedAt", "dateEnd", + "isDeleted" ], where: { profileId, status: true, isDeleted: false }, }); diff --git a/src/controllers/ProfileAbilityController.ts b/src/controllers/ProfileAbilityController.ts index 0fd2c117..c8012057 100644 --- a/src/controllers/ProfileAbilityController.ts +++ b/src/controllers/ProfileAbilityController.ts @@ -40,7 +40,7 @@ export class ProfileAbilityController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAbilityId = await this.profileAbilityRepo.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAbilityId) { @@ -55,7 +55,7 @@ export class ProfileAbilityController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const getProfileAbilityId = await this.profileAbilityRepo.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAbilityId) { diff --git a/src/controllers/ProfileAbilityEmployeeController.ts b/src/controllers/ProfileAbilityEmployeeController.ts index 3ac38706..d7ba3ae9 100644 --- a/src/controllers/ProfileAbilityEmployeeController.ts +++ b/src/controllers/ProfileAbilityEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileAbilityEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAbilityId = await this.profileAbilityRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAbilityId) { @@ -58,7 +58,7 @@ export class ProfileAbilityEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const getProfileAbilityId = await this.profileAbilityRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAbilityId) { diff --git a/src/controllers/ProfileAbilityEmployeeTempController.ts b/src/controllers/ProfileAbilityEmployeeTempController.ts index 0c0b3723..624c8ded 100644 --- a/src/controllers/ProfileAbilityEmployeeTempController.ts +++ b/src/controllers/ProfileAbilityEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileAbilityEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAbilityId = await this.profileAbilityRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAbilityId) { @@ -57,7 +57,7 @@ export class ProfileAbilityEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const getProfileAbilityId = await this.profileAbilityRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAbilityId) { diff --git a/src/controllers/ProfileAssessmentsController.ts b/src/controllers/ProfileAssessmentsController.ts index f8ca30e0..53906cb2 100644 --- a/src/controllers/ProfileAssessmentsController.ts +++ b/src/controllers/ProfileAssessmentsController.ts @@ -41,7 +41,7 @@ export class ProfileAssessmentsController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAssessments = await this.profileAssessmentsRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssessments) { @@ -59,7 +59,7 @@ export class ProfileAssessmentsController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const getProfileAssessments = await this.profileAssessmentsRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssessments) { diff --git a/src/controllers/ProfileAssessmentsEmployeeController.ts b/src/controllers/ProfileAssessmentsEmployeeController.ts index 26127f3e..0f7f3d81 100644 --- a/src/controllers/ProfileAssessmentsEmployeeController.ts +++ b/src/controllers/ProfileAssessmentsEmployeeController.ts @@ -41,7 +41,7 @@ export class ProfileAssessmentsEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAssessments = await this.profileAssessmentsRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssessments) { @@ -61,6 +61,7 @@ export class ProfileAssessmentsEmployeeController extends Controller { const getProfileAssessments = await this.profileAssessmentsRepository.find({ where: { profileEmployeeId: profileEmployeeId, + isDeleted: false }, order: { createdAt: "ASC" }, }); diff --git a/src/controllers/ProfileAssessmentsEmployeeTempController.ts b/src/controllers/ProfileAssessmentsEmployeeTempController.ts index 2aa62ff7..b6bc45e6 100644 --- a/src/controllers/ProfileAssessmentsEmployeeTempController.ts +++ b/src/controllers/ProfileAssessmentsEmployeeTempController.ts @@ -41,7 +41,7 @@ export class ProfileAssessmentsEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAssessments = await this.profileAssessmentsRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssessments) { @@ -60,6 +60,7 @@ export class ProfileAssessmentsEmployeeTempController extends Controller { const getProfileAssessments = await this.profileAssessmentsRepository.find({ where: { profileEmployeeId: profileEmployeeId, + isDeleted: false }, order: { createdAt: "ASC" }, }); diff --git a/src/controllers/ProfileAssistanceController.ts b/src/controllers/ProfileAssistanceController.ts index abff2a9f..3690f5e6 100644 --- a/src/controllers/ProfileAssistanceController.ts +++ b/src/controllers/ProfileAssistanceController.ts @@ -40,7 +40,7 @@ export class ProfileAssistanceController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAssistanceId = await this.profileAssistanceRepo.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssistanceId) { @@ -55,7 +55,7 @@ export class ProfileAssistanceController extends Controller { // if (_workflow == false) // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const getProfileAssistanceId = await this.profileAssistanceRepo.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssistanceId) { diff --git a/src/controllers/ProfileAssistanceEmployeeController.ts b/src/controllers/ProfileAssistanceEmployeeController.ts index cbd816b9..88617322 100644 --- a/src/controllers/ProfileAssistanceEmployeeController.ts +++ b/src/controllers/ProfileAssistanceEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileAssistanceEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAssistanceId = await this.profileAssistanceRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssistanceId) { @@ -58,7 +58,7 @@ export class ProfileAssistanceEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const getProfileAssistanceId = await this.profileAssistanceRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssistanceId) { diff --git a/src/controllers/ProfileAssistanceEmployeeTempController.ts b/src/controllers/ProfileAssistanceEmployeeTempController.ts index 534dafa2..da37c3a5 100644 --- a/src/controllers/ProfileAssistanceEmployeeTempController.ts +++ b/src/controllers/ProfileAssistanceEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileAssistanceEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileAssistanceId = await this.profileAssistanceRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssistanceId) { @@ -57,7 +57,7 @@ export class ProfileAssistanceEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const getProfileAssistanceId = await this.profileAssistanceRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); if (!getProfileAssistanceId) { diff --git a/src/controllers/ProfileCertificateController.ts b/src/controllers/ProfileCertificateController.ts index 88d5c492..5cbc019a 100644 --- a/src/controllers/ProfileCertificateController.ts +++ b/src/controllers/ProfileCertificateController.ts @@ -40,7 +40,7 @@ export class ProfileCertificateController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const record = await this.certificateRepo.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -52,7 +52,7 @@ export class ProfileCertificateController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const record = await this.certificateRepo.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileCertificateEmployeeController.ts b/src/controllers/ProfileCertificateEmployeeController.ts index fb6474e0..6bb4c1df 100644 --- a/src/controllers/ProfileCertificateEmployeeController.ts +++ b/src/controllers/ProfileCertificateEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileCertificateEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const record = await this.certificateRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -52,7 +52,7 @@ export class ProfileCertificateEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const record = await this.certificateRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileCertificateEmployeeTempController.ts b/src/controllers/ProfileCertificateEmployeeTempController.ts index 20ec902b..f5619023 100644 --- a/src/controllers/ProfileCertificateEmployeeTempController.ts +++ b/src/controllers/ProfileCertificateEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileCertificateEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const record = await this.certificateRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -51,7 +51,7 @@ export class ProfileCertificateEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const record = await this.certificateRepo.find({ - where: { profileEmployeeId }, + where: { profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileChangeNameController.ts b/src/controllers/ProfileChangeNameController.ts index 92ce5350..5b772f12 100644 --- a/src/controllers/ProfileChangeNameController.ts +++ b/src/controllers/ProfileChangeNameController.ts @@ -41,7 +41,7 @@ export class ProfileChangeNameController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.changeNameRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -53,7 +53,7 @@ export class ProfileChangeNameController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const lists = await this.changeNameRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileChangeNameEmployeeController.ts b/src/controllers/ProfileChangeNameEmployeeController.ts index 51ff0b8e..547368e1 100644 --- a/src/controllers/ProfileChangeNameEmployeeController.ts +++ b/src/controllers/ProfileChangeNameEmployeeController.ts @@ -41,7 +41,7 @@ export class ProfileChangeNameEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.changeNameRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -53,7 +53,7 @@ export class ProfileChangeNameEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const lists = await this.changeNameRepository.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileChangeNameEmployeeTempController.ts b/src/controllers/ProfileChangeNameEmployeeTempController.ts index 152279d6..f7a141f7 100644 --- a/src/controllers/ProfileChangeNameEmployeeTempController.ts +++ b/src/controllers/ProfileChangeNameEmployeeTempController.ts @@ -41,7 +41,7 @@ export class ProfileChangeNameEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.changeNameRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -52,7 +52,7 @@ export class ProfileChangeNameEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const lists = await this.changeNameRepository.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileChildrenController.ts b/src/controllers/ProfileChildrenController.ts index 27075758..577b6781 100644 --- a/src/controllers/ProfileChildrenController.ts +++ b/src/controllers/ProfileChildrenController.ts @@ -41,7 +41,7 @@ export class ProfileChildrenController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.childrenRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -53,7 +53,7 @@ export class ProfileChildrenController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const lists = await this.childrenRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileChildrenEmployeeController.ts b/src/controllers/ProfileChildrenEmployeeController.ts index a8792e7b..7a0cd772 100644 --- a/src/controllers/ProfileChildrenEmployeeController.ts +++ b/src/controllers/ProfileChildrenEmployeeController.ts @@ -41,7 +41,7 @@ export class ProfileChildrenEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.childrenRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -53,7 +53,7 @@ export class ProfileChildrenEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const lists = await this.childrenRepository.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileChildrenEmployeeTempController.ts b/src/controllers/ProfileChildrenEmployeeTempController.ts index 4ee31e5f..2134e954 100644 --- a/src/controllers/ProfileChildrenEmployeeTempController.ts +++ b/src/controllers/ProfileChildrenEmployeeTempController.ts @@ -41,7 +41,7 @@ export class ProfileChildrenEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.childrenRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -52,7 +52,7 @@ export class ProfileChildrenEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const lists = await this.childrenRepository.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 41fe95e7..14a77d7f 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -322,8 +322,8 @@ export class ProfileController extends Controller { ]; const educations = await this.profileEducationRepo.find({ - select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"], - where: { profileId: id }, + select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { level: "ASC" }, }); const Education = @@ -575,8 +575,8 @@ export class ProfileController extends Controller { let _child4 = child4?.orgChild4Name; const cert_raw = await this.certificateRepository.find({ - where: { profileId: id }, - select: ["certificateType", "issuer", "certificateNo", "issueDate"], + select: ["certificateType", "issuer", "certificateNo", "issueDate", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const certs = @@ -596,8 +596,8 @@ export class ProfileController extends Controller { }, ]; const training_raw = await this.trainingRepository.find({ - select: ["startDate", "endDate", "place", "department", "name"], - where: { profileId: id }, + select: ["startDate", "endDate", "place", "department", "name", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const trainings = @@ -633,8 +633,8 @@ export class ProfileController extends Controller { ]; const discipline_raw = await this.disciplineRepository.find({ - select: ["refCommandDate", "refCommandNo", "detail"], - where: { profileId: id }, + select: ["refCommandDate", "refCommandNo", "detail", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const disciplines = @@ -655,8 +655,8 @@ export class ProfileController extends Controller { ]; const education_raw = await this.profileEducationRepo.find({ - select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"], - where: { profileId: id }, + select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute", "isDeleted"], + where: { profileId: id, isDeleted: false }, // order: { lastUpdatedAt: "DESC" }, order: { level: "ASC" }, }); @@ -756,7 +756,7 @@ export class ProfileController extends Controller { insigniaType: true, }, }, - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, order: { receiveDate: "ASC" }, }); const insignias = @@ -796,7 +796,7 @@ export class ProfileController extends Controller { const leave_raw = await this.profileLeaveRepository.find({ relations: { leaveType: true }, - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, order: { dateLeaveStart: "ASC" }, }); const leaves = @@ -1052,8 +1052,8 @@ export class ProfileController extends Controller { let _child4 = child4?.orgChild4Name; const cert_raw = await this.certificateRepository.find({ - where: { profileId: id }, - select: ["certificateType", "issuer", "certificateNo", "issueDate", "expireDate"], + select: ["certificateType", "issuer", "certificateNo", "issueDate", "expireDate", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const certs = @@ -1087,8 +1087,8 @@ export class ProfileController extends Controller { }, ]; const training_raw = await this.trainingRepository.find({ - select: ["place", "department", "name", "duration"], - where: { profileId: id }, + select: ["place", "department", "name", "duration", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const trainings = @@ -1109,8 +1109,8 @@ export class ProfileController extends Controller { ]; const discipline_raw = await this.disciplineRepository.find({ - select: ["refCommandDate", "refCommandNo", "detail", "level"], - where: { profileId: id }, + select: ["refCommandDate", "refCommandNo", "detail", "level", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const disciplines = @@ -1135,6 +1135,7 @@ export class ProfileController extends Controller { const education_raw = await this.profileEducationRepo .createQueryBuilder("education") .where("education.profileId = :profileId", { profileId: id }) + .andWhere("education.isDeleted = :isDeleted", { isDeleted: false }) .orderBy("CASE WHEN education.isEducation = true THEN 1 ELSE 2 END", "ASC") .addOrderBy("education.level", "ASC") .getMany(); @@ -1245,13 +1246,14 @@ export class ProfileController extends Controller { "page", "refCommandDate", "note", + "isDeleted" ], relations: { insignia: { insigniaType: true, }, }, - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, order: { receiveDate: "ASC" }, }); const insignias = @@ -1294,6 +1296,7 @@ export class ProfileController extends Controller { .createQueryBuilder("profileLeave") .leftJoinAndSelect("profileLeave.leaveType", "leaveType") .select([ + "profileLeave.isDeleted", "profileLeave.leaveTypeId", "leaveType.name as name", "leaveType.code as code", @@ -1303,6 +1306,7 @@ export class ProfileController extends Controller { ]) .addSelect("SUM(profileLeave.leaveDays)", "totalLeaveDays") .where("profileLeave.profileId = :profileId", { profileId: id }) + .andWhere("profileLeave.isDeleted = :isDeleted", { isDeleted: false }) .andWhere("profileLeave.status = :status", { status: "approve" }) .groupBy("profileLeave.leaveTypeId") .orderBy("code", "ASC") @@ -1354,6 +1358,7 @@ export class ProfileController extends Controller { .createQueryBuilder("profileLeave") .leftJoinAndSelect("profileLeave.leaveType", "leaveType") .select([ + "profileLeave.isDeleted AS isDeleted", "profileLeave.dateLeaveStart AS dateLeaveStart", "profileLeave.dateLeaveEnd AS dateLeaveEnd", "profileLeave.leaveDays AS leaveDays", @@ -1361,6 +1366,7 @@ export class ProfileController extends Controller { "leaveType.name as name", ]) .where("profileLeave.profileId = :profileId", { profileId: id }) + .andWhere("profileLeave.isDeleted = :isDeleted", { isDeleted: false }) .andWhere("leaveType.code IN (:...codes)", { codes: ["LV-008", "LV-009", "LV-010"] }) .andWhere("profileLeave.status = :status", { status: "approve" }) .orderBy("leaveType.code", "ASC") @@ -1387,7 +1393,7 @@ export class ProfileController extends Controller { }, ]; const children_raw = await this.profileChildrenRepository.find({ - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, }); const children = children_raw.length > 0 @@ -1410,7 +1416,7 @@ export class ProfileController extends Controller { }, ]; const changeName_raw = await this.changeNameRepository.find({ - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const changeName = @@ -1504,13 +1510,13 @@ export class ProfileController extends Controller { ]; const actposition_raw = await this.profileActpositionRepo.find({ - select: ["dateStart", "dateEnd", "position"], + select: ["dateStart", "dateEnd", "position", "isDeleted"], where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const assistance_raw = await this.profileAssistanceRepository.find({ - select: ["dateStart", "dateEnd", "commandName", "agency", "document"], - where: { profileId: id }, + select: ["dateStart", "dateEnd", "commandName", "agency", "document", "isDeleted"], + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); @@ -1566,7 +1572,7 @@ export class ProfileController extends Controller { ]; const actposition = [..._actposition, ..._assistance]; const duty_raw = await this.dutyRepository.find({ - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const duty = @@ -1593,7 +1599,7 @@ export class ProfileController extends Controller { }, ]; const assessments_raw = await this.profileAssessmentsRepository.find({ - where: { profileId: id }, + where: { profileId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const assessments = @@ -9093,7 +9099,7 @@ export class ProfileController extends Controller { )?.posMasterNo; const latestProfileEducation = await this.profileEducationRepo.findOne({ - where: { profileId: item.id }, + where: { profileId: item.id, isDeleted: false }, order: { level: "ASC" }, }); @@ -11106,7 +11112,7 @@ export class ProfileController extends Controller { } const latestProfileEducation = await this.profileEducationRepo.findOne({ - where: { profileId: item.id }, + where: { profileId: item.id, isDeleted: false }, order: { level: "ASC" }, }); diff --git a/src/controllers/ProfileDisciplineController.ts b/src/controllers/ProfileDisciplineController.ts index 9edfd89d..e7ec5a94 100644 --- a/src/controllers/ProfileDisciplineController.ts +++ b/src/controllers/ProfileDisciplineController.ts @@ -40,7 +40,7 @@ export class ProfileDisciplineController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.disciplineRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -52,7 +52,7 @@ export class ProfileDisciplineController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const lists = await this.disciplineRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -63,7 +63,7 @@ export class ProfileDisciplineController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_SALARY_OFFICER"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_SALARY_OFFICER"); const lists = await this.disciplineRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileDisciplineEmployeeController.ts b/src/controllers/ProfileDisciplineEmployeeController.ts index efb3842b..22dd3f24 100644 --- a/src/controllers/ProfileDisciplineEmployeeController.ts +++ b/src/controllers/ProfileDisciplineEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileDisciplineEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.disciplineRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -52,7 +52,7 @@ export class ProfileDisciplineEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileId); const lists = await this.disciplineRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -63,7 +63,7 @@ export class ProfileDisciplineEmployeeController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_WAGE"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_WAGE"); const lists = await this.disciplineRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileDisciplineEmployeeTempController.ts b/src/controllers/ProfileDisciplineEmployeeTempController.ts index b408dfe1..b1100ab2 100644 --- a/src/controllers/ProfileDisciplineEmployeeTempController.ts +++ b/src/controllers/ProfileDisciplineEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileDisciplineEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.disciplineRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -51,7 +51,7 @@ export class ProfileDisciplineEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const lists = await this.disciplineRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -62,7 +62,7 @@ export class ProfileDisciplineEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_WAGE"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_WAGE"); const lists = await this.disciplineRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileDutyController.ts b/src/controllers/ProfileDutyController.ts index 36aee9ea..43161383 100644 --- a/src/controllers/ProfileDutyController.ts +++ b/src/controllers/ProfileDutyController.ts @@ -36,7 +36,7 @@ export class ProfileDutyController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.dutyRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -48,7 +48,7 @@ export class ProfileDutyController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const lists = await this.dutyRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileDutyEmployeeController.ts b/src/controllers/ProfileDutyEmployeeController.ts index 811ce550..82a3e9b4 100644 --- a/src/controllers/ProfileDutyEmployeeController.ts +++ b/src/controllers/ProfileDutyEmployeeController.ts @@ -36,7 +36,7 @@ export class ProfileDutyEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.dutyRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -48,7 +48,7 @@ export class ProfileDutyEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileId); const lists = await this.dutyRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileDutyEmployeeTempController.ts b/src/controllers/ProfileDutyEmployeeTempController.ts index 31e83d27..09f8f843 100644 --- a/src/controllers/ProfileDutyEmployeeTempController.ts +++ b/src/controllers/ProfileDutyEmployeeTempController.ts @@ -36,7 +36,7 @@ export class ProfileDutyEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.dutyRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -47,7 +47,7 @@ export class ProfileDutyEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const lists = await this.dutyRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileEducationsController.ts b/src/controllers/ProfileEducationsController.ts index 43843960..e9013eea 100644 --- a/src/controllers/ProfileEducationsController.ts +++ b/src/controllers/ProfileEducationsController.ts @@ -42,7 +42,7 @@ export class ProfileEducationsController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileEducation = await this.profileEducationRepo.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { level: "ASC" }, }); if (!getProfileEducation) { @@ -57,7 +57,7 @@ export class ProfileEducationsController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const getProfileEducation = await this.profileEducationRepo.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { level: "ASC" }, }); if (!getProfileEducation) { diff --git a/src/controllers/ProfileEducationsEmployeeController.ts b/src/controllers/ProfileEducationsEmployeeController.ts index cde8c6ec..c81a7309 100644 --- a/src/controllers/ProfileEducationsEmployeeController.ts +++ b/src/controllers/ProfileEducationsEmployeeController.ts @@ -42,7 +42,7 @@ export class ProfileEducationsEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileEducation = await this.profileEducationRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { level: "ASC" }, }); if (!getProfileEducation) { @@ -60,7 +60,7 @@ export class ProfileEducationsEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const getProfileEducation = await this.profileEducationRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { level: "ASC" }, }); if (!getProfileEducation) { diff --git a/src/controllers/ProfileEducationsEmployeeTempController.ts b/src/controllers/ProfileEducationsEmployeeTempController.ts index e90dfc1c..a63c88f7 100644 --- a/src/controllers/ProfileEducationsEmployeeTempController.ts +++ b/src/controllers/ProfileEducationsEmployeeTempController.ts @@ -42,7 +42,7 @@ export class ProfileEducationsEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const getProfileEducation = await this.profileEducationRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { level: "ASC" }, }); if (!getProfileEducation) { @@ -59,7 +59,7 @@ export class ProfileEducationsEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const getProfileEducation = await this.profileEducationRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { level: "ASC" }, }); if (!getProfileEducation) { diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index e87adcac..6b2e6688 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -317,8 +317,8 @@ export class ProfileEmployeeController extends Controller { ]; const educations = await this.profileEducationRepo.find({ - select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"], - where: { profileEmployeeId: id }, + select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { level: "ASC" }, }); const Education = @@ -571,8 +571,8 @@ export class ProfileEmployeeController extends Controller { let _child4 = child4?.orgChild4Name; const cert_raw = await this.certificateRepository.find({ - where: { profileEmployeeId: id }, - select: ["certificateType", "issuer", "certificateNo", "issueDate"], + select: ["certificateType", "issuer", "certificateNo", "issueDate", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const certs = @@ -592,8 +592,8 @@ export class ProfileEmployeeController extends Controller { }, ]; const training_raw = await this.trainingRepository.find({ - select: ["startDate", "endDate", "place", "department"], - where: { profileEmployeeId: id }, + select: ["startDate", "endDate", "place", "department", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const trainings = @@ -629,8 +629,8 @@ export class ProfileEmployeeController extends Controller { ]; const discipline_raw = await this.disciplineRepository.find({ - select: ["refCommandDate", "refCommandNo", "detail"], - where: { profileEmployeeId: id }, + select: ["refCommandDate", "refCommandNo", "detail", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const disciplines = @@ -651,8 +651,8 @@ export class ProfileEmployeeController extends Controller { ]; const education_raw = await this.profileEducationRepo.find({ - select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"], - where: { profileEmployeeId: id }, + select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, // order: { lastUpdatedAt: "DESC" }, order: { level: "ASC" }, }); @@ -752,7 +752,7 @@ export class ProfileEmployeeController extends Controller { insigniaType: true, }, }, - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { receiveDate: "ASC" }, }); const insignias = @@ -792,7 +792,7 @@ export class ProfileEmployeeController extends Controller { const leave_raw = await this.profileLeaveRepository.find({ relations: { leaveType: true }, - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { dateLeaveStart: "ASC" }, }); const leaves = @@ -1048,8 +1048,8 @@ export class ProfileEmployeeController extends Controller { let _child4 = child4?.orgChild4Name; const cert_raw = await this.certificateRepository.find({ - where: { profileEmployeeId: id }, - select: ["certificateType", "issuer", "certificateNo", "issueDate", "expireDate"], + select: ["certificateType", "issuer", "certificateNo", "issueDate", "expireDate", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const certs = @@ -1083,8 +1083,8 @@ export class ProfileEmployeeController extends Controller { }, ]; const training_raw = await this.trainingRepository.find({ - select: ["place", "department", "name", "duration"], - where: { profileEmployeeId: id }, + select: ["place", "department", "name", "duration", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const trainings = @@ -1105,8 +1105,8 @@ export class ProfileEmployeeController extends Controller { ]; const discipline_raw = await this.disciplineRepository.find({ - select: ["refCommandDate", "refCommandNo", "detail", "level"], - where: { profileEmployeeId: id }, + select: ["refCommandDate", "refCommandNo", "detail", "level", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const disciplines = @@ -1131,6 +1131,7 @@ export class ProfileEmployeeController extends Controller { const education_raw = await this.profileEducationRepo .createQueryBuilder("education") .where("education.profileEmployeeId = :profileId", { profileId: id }) + .andWhere("education.isDeleted = :isDeleted", { isDeleted: false }) .orderBy("CASE WHEN education.isEducation = true THEN 1 ELSE 2 END", "ASC") .addOrderBy("education.level", "ASC") .getMany(); @@ -1241,13 +1242,14 @@ export class ProfileEmployeeController extends Controller { "page", "refCommandDate", "note", + "isDeleted" ], relations: { insignia: { insigniaType: true, }, }, - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { receiveDate: "ASC" }, }); const insignias = @@ -1290,6 +1292,7 @@ export class ProfileEmployeeController extends Controller { .createQueryBuilder("profileLeave") .leftJoinAndSelect("profileLeave.leaveType", "leaveType") .select([ + "profileLeave.isDeleted", "profileLeave.leaveTypeId", "leaveType.name as name", "leaveType.code as code", @@ -1299,6 +1302,7 @@ export class ProfileEmployeeController extends Controller { ]) .addSelect("SUM(profileLeave.leaveDays)", "totalLeaveDays") .where("profileLeave.profileEmployeeId = :profileId", { profileId: id }) + .andWhere("profileLeave.isDeleted = :isDeleted", { isDeleted: false }) .andWhere("profileLeave.status = :status", { status: "approve" }) .groupBy("profileLeave.leaveTypeId") .orderBy("code", "ASC") @@ -1350,6 +1354,7 @@ export class ProfileEmployeeController extends Controller { .createQueryBuilder("profileLeave") .leftJoinAndSelect("profileLeave.leaveType", "leaveType") .select([ + "profileLeave.isDeleted AS isDeleted", "profileLeave.dateLeaveStart AS dateLeaveStart", "profileLeave.dateLeaveEnd AS dateLeaveEnd", "profileLeave.leaveDays AS leaveDays", @@ -1357,6 +1362,7 @@ export class ProfileEmployeeController extends Controller { "leaveType.name as name", ]) .where("profileLeave.profileEmployeeId = :profileId", { profileId: id }) + .andWhere("profileLeave.isDeleted = :isDeleted", { isDeleted: false }) .andWhere("leaveType.code IN (:...codes)", { codes: ["LV-008", "LV-009", "LV-010"] }) .andWhere("profileLeave.status = :status", { status: "approve" }) .orderBy("leaveType.code", "ASC") @@ -1383,7 +1389,7 @@ export class ProfileEmployeeController extends Controller { }, ]; const children_raw = await this.profileChildrenRepository.find({ - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, }); const children = children_raw.length > 0 @@ -1406,7 +1412,7 @@ export class ProfileEmployeeController extends Controller { }, ]; const changeName_raw = await this.changeNameRepository.find({ - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const changeName = @@ -1500,13 +1506,13 @@ export class ProfileEmployeeController extends Controller { ]; const actposition_raw = await this.profileActpositionRepo.find({ - select: ["dateStart", "dateEnd", "position"], + select: ["dateStart", "dateEnd", "position", "isDeleted"], where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const assistance_raw = await this.profileAssistanceRepository.find({ - select: ["dateStart", "dateEnd", "commandName", "agency", "document"], - where: { profileEmployeeId: id }, + select: ["dateStart", "dateEnd", "commandName", "agency", "document", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); @@ -1562,7 +1568,7 @@ export class ProfileEmployeeController extends Controller { ]; const actposition = [..._actposition, ..._assistance]; const duty_raw = await this.dutyRepository.find({ - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const duty = @@ -1589,7 +1595,7 @@ export class ProfileEmployeeController extends Controller { }, ]; const assessments_raw = await this.profileAssessmentsRepository.find({ - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const assessments = @@ -3854,7 +3860,7 @@ export class ProfileEmployeeController extends Controller { )?.posMasterNo; const latestProfileEducation = await this.profileEducationRepo.findOne({ - where: { profileEmployeeId: item.id }, + where: { profileEmployeeId: item.id, isDeleted: false }, order: { level: "ASC" }, }); @@ -5953,7 +5959,7 @@ export class ProfileEmployeeController extends Controller { } const latestProfileEducation = await this.profileEducationRepo.findOne({ - where: { profileEmployeeId: item.id }, + where: { profileEmployeeId: item.id, isDeleted: false }, order: { level: "ASC" }, }); diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index efe59ca2..096b3190 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -289,8 +289,8 @@ export class ProfileEmployeeTempController extends Controller { }, ]; const educations = await this.profileEducationRepo.find({ - select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"], - where: { profileEmployeeId: id }, + select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { level: "ASC" }, }); const Education = @@ -547,8 +547,8 @@ export class ProfileEmployeeTempController extends Controller { let _child4 = child4?.orgChild4Name; const cert_raw = await this.certificateRepository.find({ - where: { profileEmployeeId: id }, - select: ["certificateType", "issuer", "certificateNo", "issueDate"], + select: ["certificateType", "issuer", "certificateNo", "issueDate", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, order: { createdAt: "ASC" }, }); const certs = @@ -627,8 +627,8 @@ export class ProfileEmployeeTempController extends Controller { ]; const education_raw = await this.profileEducationRepo.find({ - select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"], - where: { profileEmployeeId: id }, + select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute", "isDeleted"], + where: { profileEmployeeId: id, isDeleted: false }, // order: { lastUpdatedAt: "DESC" }, order: { level: "ASC" }, }); @@ -734,7 +734,7 @@ export class ProfileEmployeeTempController extends Controller { insigniaType: true, }, }, - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { receiveDate: "ASC" }, }); const insignias = @@ -774,7 +774,7 @@ export class ProfileEmployeeTempController extends Controller { const leave_raw = await this.profileLeaveRepository.find({ relations: { leaveType: true }, - where: { profileEmployeeId: id }, + where: { profileEmployeeId: id, isDeleted: false }, order: { dateLeaveStart: "ASC" }, }); const leaves = @@ -2370,7 +2370,7 @@ export class ProfileEmployeeTempController extends Controller { )?.posMasterNo; const latestProfileEducation = await this.profileEducationRepo.findOne({ - where: { profileEmployeeId: item.id }, + where: { profileEmployeeId: item.id, isDeleted: false }, order: { level: "ASC" }, }); @@ -4043,7 +4043,7 @@ export class ProfileEmployeeTempController extends Controller { )?.posMasterNo; const latestProfileEducation = await this.profileEducationRepo.findOne({ - where: { profileEmployeeId: item.id }, + where: { profileEmployeeId: item.id, isDeleted: false }, order: { level: "ASC" }, }); diff --git a/src/controllers/ProfileHonorController.ts b/src/controllers/ProfileHonorController.ts index 114c76b3..057f6ad0 100644 --- a/src/controllers/ProfileHonorController.ts +++ b/src/controllers/ProfileHonorController.ts @@ -36,7 +36,7 @@ export class ProfileHonorController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const record = await this.honorRepo.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -48,7 +48,7 @@ export class ProfileHonorController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const record = await this.honorRepo.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileHonorEmployeeController.ts b/src/controllers/ProfileHonorEmployeeController.ts index 11e6ddf8..bacb5ca5 100644 --- a/src/controllers/ProfileHonorEmployeeController.ts +++ b/src/controllers/ProfileHonorEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileHonorEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const record = await this.honorRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -52,7 +52,7 @@ export class ProfileHonorEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileEmployeeId); const record = await this.honorRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileHonorEmployeeTempController.ts b/src/controllers/ProfileHonorEmployeeTempController.ts index e163aa05..dbf1ceb3 100644 --- a/src/controllers/ProfileHonorEmployeeTempController.ts +++ b/src/controllers/ProfileHonorEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileHonorEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const record = await this.honorRepo.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -51,7 +51,7 @@ export class ProfileHonorEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileEmployeeId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const record = await this.honorRepo.find({ - where: { profileEmployeeId: profileEmployeeId }, + where: { profileEmployeeId: profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileInsigniaController.ts b/src/controllers/ProfileInsigniaController.ts index 47e267f4..af871c69 100644 --- a/src/controllers/ProfileInsigniaController.ts +++ b/src/controllers/ProfileInsigniaController.ts @@ -50,7 +50,7 @@ export class ProfileInsigniaController extends Controller { insigniaType: true, }, }, - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -67,7 +67,7 @@ export class ProfileInsigniaController extends Controller { insigniaType: true, }, }, - where: { profileId }, + where: { profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileInsigniaEmployeeController.ts b/src/controllers/ProfileInsigniaEmployeeController.ts index 1921a5fd..e0d3ad82 100644 --- a/src/controllers/ProfileInsigniaEmployeeController.ts +++ b/src/controllers/ProfileInsigniaEmployeeController.ts @@ -47,7 +47,7 @@ export class ProfileInsigniaEmployeeController extends Controller { insigniaType: true, }, }, - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -64,7 +64,7 @@ export class ProfileInsigniaEmployeeController extends Controller { insigniaType: true, }, }, - where: { profileEmployeeId }, + where: { profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileInsigniaEmployeeTempController.ts b/src/controllers/ProfileInsigniaEmployeeTempController.ts index c0f3ef71..6f11cec3 100644 --- a/src/controllers/ProfileInsigniaEmployeeTempController.ts +++ b/src/controllers/ProfileInsigniaEmployeeTempController.ts @@ -47,7 +47,7 @@ export class ProfileInsigniaEmployeeTempController extends Controller { insigniaType: true, }, }, - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -63,7 +63,7 @@ export class ProfileInsigniaEmployeeTempController extends Controller { insigniaType: true, }, }, - where: { profileEmployeeId }, + where: { profileEmployeeId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileLeaveController.ts b/src/controllers/ProfileLeaveController.ts index f5601c02..a6624bbb 100644 --- a/src/controllers/ProfileLeaveController.ts +++ b/src/controllers/ProfileLeaveController.ts @@ -120,7 +120,7 @@ export class ProfileLeaveController extends Controller { } const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -136,6 +136,7 @@ export class ProfileLeaveController extends Controller { where: { profileId: profileId, // status: Not("cancel") + isDeleted: false }, order: { createdAt: "ASC" }, }); @@ -148,7 +149,7 @@ export class ProfileLeaveController extends Controller { if (_workflow == false) await new permission().PermissionGet(req, "SYS_SALARY_OFFICER"); const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileId }, + where: { profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileLeaveEmployeeController.ts b/src/controllers/ProfileLeaveEmployeeController.ts index feb6891e..ade4a5c4 100644 --- a/src/controllers/ProfileLeaveEmployeeController.ts +++ b/src/controllers/ProfileLeaveEmployeeController.ts @@ -43,7 +43,7 @@ export class ProfileLeaveEmployeeController extends Controller { } const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -56,7 +56,7 @@ export class ProfileLeaveEmployeeController extends Controller { await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileId); const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -68,7 +68,7 @@ export class ProfileLeaveEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionGet(req, "SYS_WAGE"); const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileLeaveEmployeeTempController.ts b/src/controllers/ProfileLeaveEmployeeTempController.ts index 39506d32..85960fa5 100644 --- a/src/controllers/ProfileLeaveEmployeeTempController.ts +++ b/src/controllers/ProfileLeaveEmployeeTempController.ts @@ -43,7 +43,7 @@ export class ProfileLeaveEmployeeTempController extends Controller { } const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -55,7 +55,7 @@ export class ProfileLeaveEmployeeTempController extends Controller { if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); @@ -67,7 +67,7 @@ export class ProfileLeaveEmployeeTempController extends Controller { if (_workflow == false) await new permission().PermissionGet(req, "SYS_WAGE"); const record = await this.leaveRepo.find({ relations: { leaveType: true }, - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(record); diff --git a/src/controllers/ProfileNopaidController.ts b/src/controllers/ProfileNopaidController.ts index 491aaae5..d0760d13 100644 --- a/src/controllers/ProfileNopaidController.ts +++ b/src/controllers/ProfileNopaidController.ts @@ -36,7 +36,7 @@ export class ProfileNopaidController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.nopaidRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -48,7 +48,7 @@ export class ProfileNopaidController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const lists = await this.nopaidRepository.find({ - where: { profileId }, + where: { profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileNopaidEmployeeController.ts b/src/controllers/ProfileNopaidEmployeeController.ts index fd5b7353..e5849e8e 100644 --- a/src/controllers/ProfileNopaidEmployeeController.ts +++ b/src/controllers/ProfileNopaidEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileNopaidEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.nopaidRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -51,7 +51,7 @@ export class ProfileNopaidEmployeeController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_EMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_EMP"); const lists = await this.nopaidRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileNopaidEmployeeTempController.ts b/src/controllers/ProfileNopaidEmployeeTempController.ts index 37dec407..fe6edab3 100644 --- a/src/controllers/ProfileNopaidEmployeeTempController.ts +++ b/src/controllers/ProfileNopaidEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileNopaidEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.nopaidRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -51,7 +51,7 @@ export class ProfileNopaidEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const lists = await this.nopaidRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileOtherController.ts b/src/controllers/ProfileOtherController.ts index 79ae8c8f..430af83e 100644 --- a/src/controllers/ProfileOtherController.ts +++ b/src/controllers/ProfileOtherController.ts @@ -37,7 +37,7 @@ export class ProfileOtherController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.otherRepository.find({ - where: { profileId: profile.id }, + where: { profileId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -49,7 +49,7 @@ export class ProfileOtherController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const lists = await this.otherRepository.find({ - where: { profileId: profileId }, + where: { profileId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileOtherEmployeeController.ts b/src/controllers/ProfileOtherEmployeeController.ts index 0a6622b6..c8894afe 100644 --- a/src/controllers/ProfileOtherEmployeeController.ts +++ b/src/controllers/ProfileOtherEmployeeController.ts @@ -40,7 +40,7 @@ export class ProfileOtherEmployeeController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.otherRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -52,7 +52,7 @@ export class ProfileOtherEmployeeController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_EMP", profileId); const lists = await this.otherRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ProfileOtherEmployeeTempController.ts b/src/controllers/ProfileOtherEmployeeTempController.ts index 38962384..c20914fe 100644 --- a/src/controllers/ProfileOtherEmployeeTempController.ts +++ b/src/controllers/ProfileOtherEmployeeTempController.ts @@ -40,7 +40,7 @@ export class ProfileOtherEmployeeTempController extends Controller { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } const lists = await this.otherRepository.find({ - where: { profileEmployeeId: profile.id }, + where: { profileEmployeeId: profile.id, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); @@ -51,7 +51,7 @@ export class ProfileOtherEmployeeTempController extends Controller { let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_TEMP"); if (_workflow == false) await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP"); const lists = await this.otherRepository.find({ - where: { profileEmployeeId: profileId }, + where: { profileEmployeeId: profileId, isDeleted: false }, order: { createdAt: "ASC" }, }); return new HttpSuccess(lists); diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 2e72fc6b..3966fb21 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -3659,8 +3659,9 @@ export class ReportController extends Controller { if (profileIds.length > 0) { educationsData = await this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...profileIds)", { profileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -3844,8 +3845,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child1ProfileIds)", { child1ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -4025,8 +4027,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child2ProfileIds)", { child2ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -4206,8 +4209,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child3ProfileIds)", { child3ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -4385,8 +4389,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child4ProfileIds)", { child4ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -8955,8 +8960,9 @@ export class ReportController extends Controller { if (profileIds.length > 0) { educationsData = await this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...profileIds)", { profileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -9146,8 +9152,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child1ProfileIds)", { child1ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -9333,8 +9340,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child2ProfileIds)", { child2ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -9521,8 +9529,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child3ProfileIds)", { child3ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, @@ -9708,8 +9717,9 @@ export class ReportController extends Controller { this.profileEducationRepository .createQueryBuilder("pe") - .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level"]) + .select(["pe.profileId", "pe.finishDate", "pe.degree", "pe.level", "pe.isDeleted"]) .where("pe.profileId IN (:...child4ProfileIds)", { child4ProfileIds }) + .andWhere("pe.isDeleted = :isDeleted", { isDeleted: false }) .andWhere( `(pe.profileId, COALESCE(pe.finishDate, '1900-01-01'), pe.level) IN ( SELECT pe2.profileId, diff --git a/src/entities/ProfileAbility.ts b/src/entities/ProfileAbility.ts index d2ea83d4..dcba7ee1 100644 --- a/src/entities/ProfileAbility.ts +++ b/src/entities/ProfileAbility.ts @@ -82,6 +82,13 @@ export class ProfileAbility extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany( () => ProfileAbilityHistory, (profileAbilityHistory) => profileAbilityHistory.histories, diff --git a/src/entities/ProfileAbilityHistory.ts b/src/entities/ProfileAbilityHistory.ts index 16b0de99..01aff27b 100644 --- a/src/entities/ProfileAbilityHistory.ts +++ b/src/entities/ProfileAbilityHistory.ts @@ -66,6 +66,13 @@ export class ProfileAbilityHistory extends EntityBase { }) profileAbilityId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => ProfileAbility, (profileAbility) => profileAbility.profileAbilityHistorys) @JoinColumn({ name: "profileAbilityId" }) histories: ProfileAbility; diff --git a/src/entities/ProfileAssessment.ts b/src/entities/ProfileAssessment.ts index 6ae060ed..f08ad25e 100644 --- a/src/entities/ProfileAssessment.ts +++ b/src/entities/ProfileAssessment.ts @@ -100,6 +100,13 @@ export class ProfileAssessment extends EntityBase { }) pointSumTotal: number; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany( () => ProfileAssessmentHistory, (profileAssessmentHistory) => profileAssessmentHistory.histories, diff --git a/src/entities/ProfileAssessmentHistory.ts b/src/entities/ProfileAssessmentHistory.ts index 224ea49c..5bfe8524 100644 --- a/src/entities/ProfileAssessmentHistory.ts +++ b/src/entities/ProfileAssessmentHistory.ts @@ -96,6 +96,13 @@ export class ProfileAssessmentHistory extends EntityBase { }) profileAssessmentId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne( () => ProfileAssessment, (profileAssessment) => profileAssessment.profileAssessmentHistorys, diff --git a/src/entities/ProfileAssistance.ts b/src/entities/ProfileAssistance.ts index ad01f585..06cd9ffb 100644 --- a/src/entities/ProfileAssistance.ts +++ b/src/entities/ProfileAssistance.ts @@ -94,6 +94,13 @@ export class ProfileAssistance extends EntityBase { }) commandId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => Command, (command) => command.profileSalarys) @JoinColumn({ name: "commandId" }) command: Command; diff --git a/src/entities/ProfileAssistanceHistory.ts b/src/entities/ProfileAssistanceHistory.ts index 344c6dc0..8a106203 100644 --- a/src/entities/ProfileAssistanceHistory.ts +++ b/src/entities/ProfileAssistanceHistory.ts @@ -62,6 +62,13 @@ export class ProfileAssistanceHistory extends EntityBase { }) profileAssistanceId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne( () => ProfileAssistance, (profileAssistance) => profileAssistance.profileAssistanceHistorys, diff --git a/src/entities/ProfileCertificate.ts b/src/entities/ProfileCertificate.ts index 730bde73..867c7797 100644 --- a/src/entities/ProfileCertificate.ts +++ b/src/entities/ProfileCertificate.ts @@ -74,6 +74,13 @@ export class ProfileCertificate extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany( () => ProfileCertificateHistory, (profileCertificateHistory) => profileCertificateHistory.histories, diff --git a/src/entities/ProfileCertificateHistory.ts b/src/entities/ProfileCertificateHistory.ts index 022d1e17..0e9a0834 100644 --- a/src/entities/ProfileCertificateHistory.ts +++ b/src/entities/ProfileCertificateHistory.ts @@ -58,6 +58,13 @@ export class ProfileCertificateHistory extends EntityBase { }) profileCertificateId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne( () => ProfileCertificate, (profileCertificate) => profileCertificate.profileCertificateHistories, diff --git a/src/entities/ProfileChangeName.ts b/src/entities/ProfileChangeName.ts index 74767fa2..b02117fc 100644 --- a/src/entities/ProfileChangeName.ts +++ b/src/entities/ProfileChangeName.ts @@ -77,6 +77,13 @@ export class ProfileChangeName extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany( () => ProfileChangeNameHistory, (profileChangeNameHistory) => profileChangeNameHistory.histories, diff --git a/src/entities/ProfileChangeNameHistory.ts b/src/entities/ProfileChangeNameHistory.ts index 619344dd..5d296161 100644 --- a/src/entities/ProfileChangeNameHistory.ts +++ b/src/entities/ProfileChangeNameHistory.ts @@ -60,6 +60,13 @@ export class ProfileChangeNameHistory extends EntityBase { }) profileChangeNameId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne( () => ProfileChangeName, (profileChangeName) => profileChangeName.profileChangeNameHistories, diff --git a/src/entities/ProfileChildren.ts b/src/entities/ProfileChildren.ts index 23f3b507..d4f07c72 100644 --- a/src/entities/ProfileChildren.ts +++ b/src/entities/ProfileChildren.ts @@ -72,6 +72,13 @@ export class ProfileChildren extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => Profile, (Profile) => Profile.profileChildrens) @JoinColumn({ name: "profileId" }) profile: Profile; diff --git a/src/entities/ProfileChildrenHistory.ts b/src/entities/ProfileChildrenHistory.ts index 39e34b74..a402c41e 100644 --- a/src/entities/ProfileChildrenHistory.ts +++ b/src/entities/ProfileChildrenHistory.ts @@ -55,6 +55,13 @@ export class ProfileChildrenHistory extends EntityBase { }) profileChildrenId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + // @ManyToOne(() => ProfileChildren, (profileChildren) => profileChildren.profileChildrenHistories) // @JoinColumn({ name: "profileChildrenId" }) // histories: ProfileChildren; diff --git a/src/entities/ProfileDiscipline.ts b/src/entities/ProfileDiscipline.ts index 6220b712..0065528b 100644 --- a/src/entities/ProfileDiscipline.ts +++ b/src/entities/ProfileDiscipline.ts @@ -82,6 +82,13 @@ export class ProfileDiscipline extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany( () => ProfileDisciplineHistory, (profileDisciplineHistory) => profileDisciplineHistory.histories, diff --git a/src/entities/ProfileDisciplineHistory.ts b/src/entities/ProfileDisciplineHistory.ts index f265a825..e7dfee58 100644 --- a/src/entities/ProfileDisciplineHistory.ts +++ b/src/entities/ProfileDisciplineHistory.ts @@ -65,6 +65,13 @@ export class ProfileDisciplineHistory extends EntityBase { }) isUpload: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne( () => ProfileDiscipline, (profileDiscipline) => profileDiscipline.profileDisciplineHistories, diff --git a/src/entities/ProfileDuty.ts b/src/entities/ProfileDuty.ts index 5684f650..7c2d8338 100644 --- a/src/entities/ProfileDuty.ts +++ b/src/entities/ProfileDuty.ts @@ -82,6 +82,13 @@ export class ProfileDuty extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany(() => ProfileDutyHistory, (profileDutyHistory) => profileDutyHistory.histories) profileDutyHistories: ProfileDutyHistory[]; diff --git a/src/entities/ProfileDutyHistory.ts b/src/entities/ProfileDutyHistory.ts index e00f4d5f..24c61a5c 100644 --- a/src/entities/ProfileDutyHistory.ts +++ b/src/entities/ProfileDutyHistory.ts @@ -66,6 +66,13 @@ export class ProfileDutyHistory extends EntityBase { }) profileDutyId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => ProfileDuty, (profileDuty) => profileDuty.profileDutyHistories) @JoinColumn({ name: "profileDutyId" }) histories: ProfileDuty; diff --git a/src/entities/ProfileEducation.ts b/src/entities/ProfileEducation.ts index 351aeec0..0b7c6f6e 100644 --- a/src/entities/ProfileEducation.ts +++ b/src/entities/ProfileEducation.ts @@ -196,6 +196,13 @@ export class ProfileEducation extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany( () => ProfileEducationHistory, (profileEducationHistory) => profileEducationHistory.histories, diff --git a/src/entities/ProfileEducationHistory.ts b/src/entities/ProfileEducationHistory.ts index 7a8d5497..6ffb118c 100644 --- a/src/entities/ProfileEducationHistory.ts +++ b/src/entities/ProfileEducationHistory.ts @@ -166,6 +166,13 @@ export class ProfileEducationHistory extends EntityBase { }) profileEducationId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne( () => ProfileEducation, (profileEducation) => profileEducation.profileEducationHistories, diff --git a/src/entities/ProfileHonor.ts b/src/entities/ProfileHonor.ts index 481e195f..73ec072f 100644 --- a/src/entities/ProfileHonor.ts +++ b/src/entities/ProfileHonor.ts @@ -89,6 +89,13 @@ export class ProfileHonor extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany(() => ProfileHonorHistory, (profileHonorHistory) => profileHonorHistory.histories) profileHonorHistories: ProfileHonorHistory[]; diff --git a/src/entities/ProfileHonorHistory.ts b/src/entities/ProfileHonorHistory.ts index 59338365..d22137ab 100644 --- a/src/entities/ProfileHonorHistory.ts +++ b/src/entities/ProfileHonorHistory.ts @@ -73,6 +73,13 @@ export class ProfileHonorHistory extends EntityBase { }) isUpload: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => ProfileHonor, (profileHonor) => profileHonor.profileHonorHistories) @JoinColumn({ name: "profileHonorId" }) histories: ProfileHonor; diff --git a/src/entities/ProfileInsignia.ts b/src/entities/ProfileInsignia.ts index b7fa824d..d09e71ee 100644 --- a/src/entities/ProfileInsignia.ts +++ b/src/entities/ProfileInsignia.ts @@ -137,6 +137,13 @@ export class ProfileInsignia extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => Insignia, (v) => v.profileInsignias) insignia: Insignia; diff --git a/src/entities/ProfileInsigniaHistory.ts b/src/entities/ProfileInsigniaHistory.ts index cc4fa5d7..4381b900 100644 --- a/src/entities/ProfileInsigniaHistory.ts +++ b/src/entities/ProfileInsigniaHistory.ts @@ -65,6 +65,13 @@ export class ProfileInsigniaHistory extends EntityBase { }) profileInsigniaId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => ProfileInsignia, (profileInsignia) => profileInsignia.profileInsigniaHistories) @JoinColumn({ name: "profileInsigniaId" }) histories: ProfileInsignia; diff --git a/src/entities/ProfileLeave.ts b/src/entities/ProfileLeave.ts index 2728b32b..f037e303 100644 --- a/src/entities/ProfileLeave.ts +++ b/src/entities/ProfileLeave.ts @@ -100,6 +100,13 @@ export class ProfileLeave extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany(() => ProfileLeaveHistory, (v) => v.profileLeave) histories: ProfileLeaveHistory[]; @@ -124,6 +131,13 @@ export class ProfileLeaveHistory extends ProfileLeave { }) profileLeaveId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean = false; + @ManyToOne(() => ProfileLeave, (v) => v.histories) profileLeave: ProfileLeave; } diff --git a/src/entities/ProfileNopaid.ts b/src/entities/ProfileNopaid.ts index 1f90025f..7eb2e82f 100644 --- a/src/entities/ProfileNopaid.ts +++ b/src/entities/ProfileNopaid.ts @@ -74,6 +74,13 @@ export class ProfileNopaid extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany(() => ProfileNopaidHistory, (profileNopaidHistory) => profileNopaidHistory.histories) profileNopaidHistories: ProfileNopaidHistory[]; diff --git a/src/entities/ProfileNopaidHistory.ts b/src/entities/ProfileNopaidHistory.ts index 905395ef..6bb14d0b 100644 --- a/src/entities/ProfileNopaidHistory.ts +++ b/src/entities/ProfileNopaidHistory.ts @@ -58,6 +58,13 @@ export class ProfileNopaidHistory extends EntityBase { }) profileNopaidId: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => ProfileNopaid, (profileNopaid) => profileNopaid.profileNopaidHistories) @JoinColumn({ name: "profileNopaidId" }) histories: ProfileNopaid; diff --git a/src/entities/ProfileOther.ts b/src/entities/ProfileOther.ts index b64171ed..497886be 100644 --- a/src/entities/ProfileOther.ts +++ b/src/entities/ProfileOther.ts @@ -44,6 +44,13 @@ export class ProfileOther extends EntityBase { }) isEntry: boolean; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @OneToMany(() => ProfileOtherHistory, (profileOtherHistory) => profileOtherHistory.histories) profileOtherHistories: ProfileOtherHistory[]; diff --git a/src/entities/ProfileOtherHistory.ts b/src/entities/ProfileOtherHistory.ts index 15ea3588..654425a7 100644 --- a/src/entities/ProfileOtherHistory.ts +++ b/src/entities/ProfileOtherHistory.ts @@ -28,6 +28,13 @@ export class ProfileOtherHistory extends EntityBase { }) date: Date; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => ProfileOther, (profileOther) => profileOther.profileOtherHistories) @JoinColumn({ name: "profileOtherId" }) histories: ProfileOther; diff --git a/src/entities/ProfileSalary.ts b/src/entities/ProfileSalary.ts index ddbe184b..1ab7acab 100644 --- a/src/entities/ProfileSalary.ts +++ b/src/entities/ProfileSalary.ts @@ -287,6 +287,13 @@ export class ProfileSalary extends EntityBase { }) positionArea: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => Command, (command) => command.profileSalarys) @JoinColumn({ name: "commandId" }) command: Command; diff --git a/src/entities/ProfileSalaryBackup.ts b/src/entities/ProfileSalaryBackup.ts index 29cdd325..1274e319 100644 --- a/src/entities/ProfileSalaryBackup.ts +++ b/src/entities/ProfileSalaryBackup.ts @@ -292,4 +292,11 @@ export class ProfileSalaryBackup extends EntityBase { }) positionArea: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + } \ No newline at end of file diff --git a/src/entities/ProfileSalaryHistory.ts b/src/entities/ProfileSalaryHistory.ts index ea6af033..b5482c29 100644 --- a/src/entities/ProfileSalaryHistory.ts +++ b/src/entities/ProfileSalaryHistory.ts @@ -228,6 +228,13 @@ export class ProfileSalaryHistory extends EntityBase { }) posNumCodeSitAbb: string; + @Column({ + nullable: false, + comment: "สถานะลบข้อมูล", + default: false, + }) + isDeleted: boolean; + @ManyToOne(() => Command, (command) => command.profileSalaryHistorys) @JoinColumn({ name: "commandId" }) command: Command; diff --git a/src/migration/1770870836370-add_fields_isDeleted.ts b/src/migration/1770870836370-add_fields_isDeleted.ts new file mode 100644 index 00000000..6d04805c --- /dev/null +++ b/src/migration/1770870836370-add_fields_isDeleted.ts @@ -0,0 +1,74 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddFieldsIsDeleted1770870836370 implements MigrationInterface { + name = 'AddFieldsIsDeleted1770870836370' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`profileCertificateHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileCertificate\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileInsigniaHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileInsignia\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileHonorHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileHonor\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileAssessmentHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileAssessment\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileLeave\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileLeaveHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileDutyHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileDuty\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileNopaidHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileNopaid\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileDisciplineHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileDiscipline\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileChangeNameHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileChangeName\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileEducationHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileEducation\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileAbilityHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileAbility\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileOtherHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileOther\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileChildren\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileSalaryHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileSalary\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileAssistanceHistory\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileAssistance\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`profileSalaryBackup\` ADD \`isDeleted\` tinyint NOT NULL COMMENT 'สถานะลบข้อมูล' DEFAULT 0`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`profileSalaryBackup\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileAssistance\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileAssistanceHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileSalary\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileSalaryHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileChildren\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileOther\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileOtherHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileAbility\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileAbilityHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileEducation\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileEducationHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileChangeName\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileChangeNameHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileDiscipline\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileDisciplineHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileNopaid\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileNopaidHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileDuty\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileDutyHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileLeaveHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileLeave\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileAssessment\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileAssessmentHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileHonor\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileHonorHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileInsignia\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileInsigniaHistory\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileCertificate\` DROP COLUMN \`isDeleted\``); + await queryRunner.query(`ALTER TABLE \`profileCertificateHistory\` DROP COLUMN \`isDeleted\``); + } + +}