hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ วันที่ update

Browse source
This commit is contained in:
kittapath 2024-08-30 18:02:34 +07:00
parent 6d36c9b05f
commit 218886b3f4
83 changed files with 1671 additions and 3483 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/controllers/ProfileEmployeeController.ts
View file

@ -666,6 +666,9 @@ export class ProfileEmployeeController extends Controller {
await this.profileHistoryRepo.save(
Object.assign(new ProfileEmployeeHistory(), {
...record,
lastUpdateUserId: request.user.sub,
lastUpdateFullName: request.user.name,
lastUpdatedAt: new Date(),
profileEmployeeId: id,
id: undefined,
}),
@ -2923,11 +2926,15 @@ export class ProfileEmployeeController extends Controller {
if (!profileEmp) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์นี้");
const history = new ProfileEmployeeInformationHistory();
Object.assign(history, { ...profileEmp, id: undefined });
Object.assign(profileEmp, body);
Object.assign(history, { ...profileEmp, id: undefined });
history.profileEmployeeId = profileEmployeeId;
history.lastUpdateFullName = request.user.name;
history.lastUpdateUserId = request.user.sub;
history.lastUpdatedAt = new Date();
history.createdUserId = request.user.sub;
history.createdFullName = request.user.name;
history.createdAt = new Date();
profileEmp.lastUpdateUserId = request.user.sub;
profileEmp.lastUpdateFullName = request.user.name;
@ -3103,24 +3110,26 @@ export class ProfileEmployeeController extends Controller {
if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
await new permission().PermissionOrgUserUpdate(request, "SYS_REGISTRY_EMP", profile.id);
const employment = new ProfileEmployeeEmployment();
// const history = new ProfileEmployeeEmploymentHistory();
Object.assign(employment, body);
employment.profileEmployeeId = profileEmployeeId;
employment.createdUserId = request.user.sub;
employment.createdFullName = request.user.name;
employment.lastUpdateUserId = request.user.sub;
employment.lastUpdateFullName = request.user.name;
await this.employmentRepository.save(employment);
// if (employment) {
// Object.assign(history, { ...employment, id: undefined });
// history.profileEmployeeEmploymentId = employment.id;
// history.createdUserId = request.user.sub;
// history.createdFullName = request.user.name;
// history.lastUpdateFullName = request.user.name;
// history.lastUpdateUserId = request.user.sub;
// await this.employmentHistoryRepository.save(history);
// }
const data = new ProfileEmployeeEmployment();
const meta = {
createdUserId: request.user.sub,
createdFullName: request.user.name,
lastUpdateUserId: request.user.sub,
lastUpdateFullName: request.user.name,
createdAt: new Date(),
lastUpdatedAt: new Date(),
profileEmployeeId: profileEmployeeId,
};
Object.assign(data, { ...body, ...meta });
const history = new ProfileEmployeeEmploymentHistory();
Object.assign(history, { ...data, id: undefined });
await this.employmentRepository.save(data);
history.profileEmployeeEmploymentId = data.id;
await this.employmentHistoryRepository.save(history);
return new HttpSuccess();
}
@ -3176,14 +3185,16 @@ export class ProfileEmployeeController extends Controller {
);
const history = new ProfileEmployeeEmploymentHistory();
Object.assign(history, { ...employment, id: undefined });
Object.assign(employment, body);
Object.assign(history, { ...employment, id: undefined });
employment.lastUpdateUserId = request.user.sub;
employment.lastUpdateFullName = request.user.name;
history.profileEmployeeEmploymentId = id;
history.lastUpdateFullName = request.user.name;
history.lastUpdateUserId = request.user.sub;
history.lastUpdateFullName = request.user.name;
history.createdUserId = request.user.sub;
history.createdFullName = request.user.name;
await Promise.all([
this.employmentRepository.save(employment),
@ -3210,6 +3221,7 @@ export class ProfileEmployeeController extends Controller {
statusTemp: "REPORT",
lastUpdateUserId: request.user.sub,
lastUpdateFullName: request.user.name,
lastUpdatedAt: new Date(),
};
}),
);